Commit Graph

21234 Commits

Author SHA1 Message Date
Expletive
0398128384 Adds light (#28179) 2017-06-08 12:31:03 +02:00
Jordan Brown
33fbd29bbe Fixes IRC ahelps 2017-06-07 22:25:17 -04:00
oranges
7da58ff009 Removes the headpatting code and the slapping code (#28028) 2017-06-07 22:55:14 -03:00
QualityVan
02bb8d0dc4 Adds creamatoriums (#28158) 2017-06-07 22:44:38 -03:00
Expletive
18807306a0 Fixes 28154: Accidental cargo exploit edition. (#28172) 2017-06-07 22:41:30 -03:00
Joan Lung
985aab7b62 Merge pull request #28160 from QualityVan/ormplasteel
Fixes ORM alloy material consumption
2017-06-07 20:25:57 -04:00
Joan Lung
f069ec979c Merge pull request #28162 from Expletive/soundbang
Refactors soundbang_act to use adjustEarDamage
2017-06-07 20:25:36 -04:00
Joan Lung
0b56e9af1d Merge pull request #28080 from kevinz000/patch-208
adds proper gibtonite detonation timing
2017-06-07 19:45:32 -04:00
kevinz000
aedc90be50 Update ores_coins.dm 2017-06-07 16:12:24 -07:00
kevinz000
365330c9e6 Update ores_coins.dm 2017-06-07 16:11:57 -07:00
ShizCalev
6e59b20716 Syndicate Uplink - Typos & Grammar mk2 (#28145) 2017-06-07 16:55:18 -03:00
Expletive
12d522dbc0 Organs for catgirls (#28148) 2017-06-07 16:15:33 -03:00
kevinz000
99138f12d0 I might HAVE accidently made dualwielding hilariously OP again so have a nerf! (#28125) 2017-06-07 11:13:57 -03:00
Leo
4f3d720c93 Merge pull request #28124 from Shadowlight213/whywasthisevenadded
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones
2017-06-07 11:07:13 -03:00
Leo
a9d9e986ef Merge pull request #28122 from LanCartwright/fixesgel
Lowers Uranium virology reagents down to 1 from 5
2017-06-07 09:38:37 -03:00
Jordie
73882dcc49 Fix to round_id and .getserverlog (#28130) 2017-06-07 09:37:53 -03:00
kevinz000
c5fce5b01e gas miners only update overlays when they actually need to (#28114)
* Update miner.dm

* Update miner.dm
2017-06-07 09:06:18 +02:00
Expletive
8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Jordan Brown
e6bfb7f449 Refactors datum verbs to be general (#28109) 2017-06-06 22:21:26 -03:00
Expletive
12092620ab make readable 2017-06-06 18:12:55 -07:00
Expletive
e34cf1445f Make it work the same 2017-06-06 17:07:43 -07:00
Expletive
0de059e60b Soundbangs use AdjustEarDamage 2017-06-06 17:02:38 -07:00
swindly
b976845de3 Weaponizes station charters (#28111) 2017-06-06 20:40:01 -03:00
QualityVan
454bb4d831 Fixes ORM alloy material consumption 2017-06-06 19:05:29 -04:00
Jordan Brown
b8094b48f3 Fixes logged out spawning new_players (#28105) 2017-06-06 15:27:27 -03:00
Leo
54a15e9dfa Merge pull request #28102 from Cyberboss/patch-106
Graceful shutdown now asks the server to kill it
2017-06-06 15:25:35 -03:00
Joan Lung
cffc868325 KA modkits in necropolis chests are now design discs to force miners to bring back minerals (#28098) 2017-06-06 12:25:03 -03:00
Leo
a940b11037 Merge pull request #28083 from kevinz000/patch-210
Fixes projectile fields blocking clicks
2017-06-06 09:14:43 -03:00
Shadowlight213
0150de51c3 Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones 2017-06-05 20:58:12 -07:00
Akke
dd313992c1 lowers gel cost to 1 from 5 2017-06-06 04:47:52 +01:00
4DPlanner
c7d8e5b5f7 Merge remote-tracking branch 'upstream/master' into datum - I genuinely
have no idea how this was a merge conflict and also fixes paren
2017-06-06 02:49:04 +01:00
kevinz000
f051ecba25 Adds consciousness checks to beam rifles (#28079) 2017-06-05 22:37:54 -03:00
Leo
09be4ac25c Merge pull request #28069 from QualityVan/cableweight
Makes cable great again
2017-06-05 18:38:57 -03:00
Leo
8b6d319cfd Merge pull request #28068 from Cyberboss/ReaddIRCCheck
Add status string for server tools
2017-06-05 18:28:11 -03:00
WJohn
f6063b936f Adds some more syndicate equipment. (#28046) 2017-06-05 15:50:11 -03:00
Leo
30863f29d6 Merge pull request #28064 from ChangelingRain/hierophanttweak
When murdering mining mobs, the Hierophant will ignore legion skulls
2017-06-05 15:26:07 -03:00
Joan Lung
9f9d1ff2e1 Cogscarabs can no longer use guns (#28066) 2017-06-05 15:22:49 -03:00
Joan Lung
5884071627 Renames Clockwork Proselytizers to Replica Fabricators (#28062) 2017-06-05 14:52:31 -03:00
Joan Lung
180dd7bd84 Adds another unique KA mod to necropolis chests (#27982) 2017-06-05 14:52:03 -03:00
Expletive
ed480ef08e Fixes problems that were in the original PR (#28099) 2017-06-05 13:55:30 -03:00
Jordan Brown
226a37b2ca Graceful shutdown now asks the server to kill it 2017-06-05 11:52:20 -04:00
Leo
aada38ff3c Removes check_tick from ORM ui_data 2017-06-05 09:49:11 -03:00
Joan Lung
41e3120356 Merge pull request #28057 from Expletive/tguiorm
Ports the Ore Redemption Machine to TGUI
2017-06-05 08:43:08 -04:00
Expletive
a4063f5488 Add text fields, rglass smelting, style changes, sheet insertion. 2017-06-05 04:37:47 -07:00
kevinz000
4e106b42e1 Update peaceborg_dampener.dm 2017-06-04 20:24:50 -07:00
Leo
f7fbec3669 Merge pull request #28048 from kevinz000/patch-204
Makes the admin repair buildmode templates work
2017-06-05 00:23:34 -03:00
InsaneHyena
5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
kevinz000
94758b7c18 Update ores_coins.dm 2017-06-04 19:10:07 -07:00
kevinz000
5da9822c32 Update ores_coins.dm 2017-06-04 19:05:41 -07:00
Leo
267c7622fd Merge pull request #28045 from WJohn/fixes_suit_store
Fixes suit_store not working for ghost roles.
2017-06-04 21:23:51 -03:00