50cc057504
Lots of fixes and improvements
2015-02-04 17:35:42 +04:00
8c2961c79b
MoreConflictFixing
2015-02-04 19:37:57 +08:00
cd9a08e684
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
code/modules/projectiles/ammunition/energy.dm
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-04 18:36:50 +08:00
01bf5b343f
Adds purple shorts.
2015-02-04 01:23:58 -06:00
7903aba6d3
Adds optional population caps for those that want them. These be dark measures, so tread carefully ye who dare enter this place.
...
There are three "levels" of popcaps, and you can use them in any assortment you like:
The "soft" cap produces a message on join, and takes no action.
The "hard" cap disallows joining whilst too many other people are alive and playing in game, but allows observing.
The "extreme" cap prevents people from joining the server at all while the cap is exceeded. It won't kick out people who failed to qualify during roundstart, but if they leave they won't be able to get back in.
In each case a customizable message config option has been given. Admins are also immune to most population caps (they still are hit by the ones in job shuffling, but can late join as normal afterwards)
2015-02-04 01:58:02 -05:00
8400ec9800
Adds work boots and fixes character setup previews.
2015-02-04 00:32:15 -06:00
791381394c
Ports the kinetic accelerator changes from NT
2015-02-03 21:19:30 -08:00
4f618c9ca3
fixed slime drag exploits
2015-02-03 22:09:05 -07:00
6e329a6cf4
fixes hardsuit runtime
2015-02-03 21:07:38 -08:00
495ae29ab8
helmet, armor, and corgi changes
2015-02-03 19:12:38 -08:00
d0b51e86ed
fixes #7154
2015-02-03 19:09:18 -08:00
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
a480ffbc98
whole lotta bugfixes
2015-02-03 17:57:57 -08:00
53a1590a9e
fixes ebow sound when reloading
2015-02-03 14:48:04 -08:00
5f884b6017
Merge pull request #7496 from dannno/killyoselfmyman
...
Adds proper suicide messages to like a lot of stuff
2015-02-03 16:43:09 -06:00
6290462c20
Adds Debug verbs for Movable and Snap UI Elements (R_DEBUG Admin rank required)
2015-02-03 22:38:45 +00:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
784766e8cc
Merge pull request #7509 from paprka/gunstuff
...
Improves pulse guns, ERT, and centcomm areas
2015-02-03 16:14:48 -06:00
890b3800e6
some clothing changes
2015-02-03 09:00:51 -08:00
500a236b51
Merge pull request #7507 from paprka/hardsuitfixes
...
Fixes mining helmet not having nodrop or thickmaterial flags
2015-02-03 16:03:15 +01:00
6de33d4063
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
...
Conflicts:
_maps/map_files/generic/z2.dmm
2015-02-02 19:13:49 -08:00
48413b4a89
makes roundstart pills append their reagent number to their name, only roundstart ones do this
2015-02-02 18:35:51 -08:00
6068fb4162
Merge pull request #7455 from Iamgoofball/patch-25
...
Fixes #7258
2015-02-02 18:32:02 -08:00
d8823a8038
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
2015-02-02 19:30:24 -05:00
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
e4262d21a5
nanite injector for med ert
2015-02-02 06:24:16 -08:00
8601e385a5
BreachingShot
2015-02-02 20:14:23 +08:00
106fbf6347
Merge pull request #7487 from paprka/voxtest
...
Removes voxtest 2, removes /tg/ culture
2015-02-02 15:02:27 +03:00
d232086ff5
small bandaid fix
2015-02-02 03:54:24 -08:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
8173cd2460
fixes pulse rifles not being emp proof apparently
2015-02-01 23:27:56 -08:00
4756bcec13
adds a skeleton ghost for byond supporters
2015-02-01 22:58:55 -08:00
f6be6754ae
readds the stun revolver (oops)
2015-02-01 21:32:51 -08:00
a5dcd1abd8
improves ert spawning and centcomm
2015-02-01 21:16:11 -08:00
55bdca20da
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
2015-02-01 18:22:02 -08:00
0ef611fa98
fixes mining helmet not having nodrop or thickmaterial
2015-02-01 18:17:01 -08:00
f8bb02d54a
Merge pull request #7422 from Steelpoint/ERTBalance2
...
ERT Balance Pass 2 | ERT Access and Foam
2015-02-01 20:16:04 -06:00
0ec5648413
Merge branch 'killyoselfmyman' of https://github.com/dannno/-tg-station into killyoselfmyman
2015-02-01 19:46:05 -05:00
c48bf44a47
framework for a future "suicide hotline" job
2015-02-01 19:44:54 -05:00
c4fccf2651
remove redundant message
2015-02-01 16:35:14 -05:00
a8fd8d13fa
how about i put you to sleep kraso
...
with a banana
by killing you with it
2015-02-01 16:33:50 -05:00
ea38b1beac
makes epipens more powerful at stopping losebreath
...
read title
2015-02-01 12:29:09 -08:00
fbad839b4c
Fixes #7493
...
Fixes #7493
this also fixes ODing on epi pills
2015-02-01 12:26:53 -08:00
f2ccc18c5c
kill yourself with banana my friend
2015-02-01 14:19:17 -05:00
ad07210e99
Accidentally set the maximum force of all weapons to 5 #justwizbiz
2015-02-01 14:07:49 -05:00
f8b6b53867
Adds the RPG loot wizard event at an uncommon (3) weight
...
All items in the world at the time of event gain a small bonus/penalty to force and throwforce, and a corresponding silly name.
Taking all suggestions for more prefixes and suffixes. Prefixes should imply a positive or negative quality, but suffixes shouldn't.
2015-02-01 13:31:29 -05:00
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
a0b2e72b4c
gun suicide messages
2015-02-01 11:04:40 -05:00
920bca9147
Merge pull request #7358 from Delimusca/gooeyfun
...
Minor slime enhancements
2015-02-01 14:04:52 +01:00
6108f10b63
removes range from ebow bolts
2015-02-01 03:56:23 -08:00
Lo6a4evskiy
Steelpoint
TZK13
Incoming
Iamgoofball
Delimusca
paprka
Cheridan
Remie Richards
Swag McYolosteinen
hornygranny
dannno
Razharas
xxalpha