hornygranny
|
2f9236bdb8
|
Merge pull request #5443 from paprka/flipriothelmet
Adds riot visor flipping
|
2014-10-27 10:09:41 -07:00 |
|
hornygranny
|
7eec063785
|
Merge pull request #5479 from Cheridan/rip_scratch
Adds Doc Scratch costume in reverse.
|
2014-10-27 10:08:47 -07:00 |
|
Cheridan
|
211bb20e53
|
Merge pull request #5445 from tkdrg/pointandlaugh
Makes point into a mob verb.
|
2014-10-26 20:33:53 -05:00 |
|
hornygranny
|
5bca7ee057
|
Merge pull request #5079 from Miauw62/thespookisreal
SPOOK STATION 13
|
2014-10-26 15:12:24 -07:00 |
|
paprka
|
090d61adf4
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into flipriothelmet
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
|
2014-10-26 14:07:51 -07:00 |
|
Cheridan
|
4525ab93cf
|
Adds Doc Scratch costume in reverse.
Since everyone's already mad anyway.
|
2014-10-26 03:37:56 -05:00 |
|
Cheridan
|
bc71885a17
|
Merge pull request #5448 from paprka/hossystuff
Adds HoS drill hat, and violently guts jensen cosplay from HoS
|
2014-10-25 21:44:40 -05:00 |
|
tkdrg
|
c83bf83108
|
Fixes #2098
|
2014-10-25 22:54:25 -03:00 |
|
tkdrg
|
b37b2651d3
|
Point is now a mob verb to reduce lag
|
2014-10-25 22:54:17 -03:00 |
|
hornygranny
|
6a918f98c5
|
Merge pull request #5454 from MrStonedOne/t-t-t-tadaydb
Adds admin verb to reestablish connection to the database
|
2014-10-25 18:41:24 -07:00 |
|
Cheridan
|
5bf303da00
|
Merge pull request #5430 from scoopscoop/csscargoconsoles
Cargo console CSS visual tweaks
|
2014-10-25 16:31:26 -05:00 |
|
paprka
|
51a4bd7be6
|
drill sergeant hat for HoS instead of police
|
2014-10-25 13:51:36 -07:00 |
|
Miauw62
|
9a378933d2
|
Makes spookoween compile
|
2014-10-25 11:40:53 +00:00 |
|
Miauw62
|
a0d3a09ef8
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal
Conflicts:
code/modules/events/carp_migration.dm
|
2014-10-25 11:29:07 +00:00 |
|
Miauw62
|
64ee84889d
|
Merge branch 'thespookisreal' of https://github.com/Menshin/-tg-station into thespookisreal
Conflicts:
code/modules/holiday/halloween.dm
|
2014-10-25 11:23:32 +00:00 |
|
MrStonedOne
|
de06436320
|
Makes re-establish db connection verb logic better
|
2014-10-24 12:34:07 -07:00 |
|
MrStonedOne
|
3ebd53b7c7
|
Adds new admin verb to reconnect to the database when the connection dies.
|
2014-10-24 11:21:15 -07:00 |
|
paprka
|
9cc31a3b85
|
adds HoS black police hat, and other changes
|
2014-10-24 04:19:11 -07:00 |
|
paprka
|
bea7f8989d
|
adds riot visor flipping
|
2014-10-23 20:31:48 -07:00 |
|
hornygranny
|
0cc07336d8
|
Merge pull request #5423 from phil235/PandemicMsgFix1
Adding a message to the pandemic computer
|
2014-10-23 13:17:20 -07:00 |
|
hornygranny
|
242621b87c
|
Merge pull request #5422 from xxalpha/flashfix
Finish repathing flashes
|
2014-10-23 11:22:54 -07:00 |
|
Cheridan
|
a0ae729ce3
|
Merge pull request #5420 from phil235/AnomalyFix
Fixes two bugs with anomalies
|
2014-10-23 09:27:28 -05:00 |
|
scoopscoop
|
9d98640bc7
|
The supply shuttle, supply ordering, ore redemption and mining vendor consoles in cargo now use datum/browser/popups instead of user << browse so they don't look like random HTML pages.
|
2014-10-23 15:26:33 +03:00 |
|
hornygranny
|
3a98979572
|
Merge pull request #5393 from paprka/cooljackets
Adds bomber and leather jackets + toolbelt improvements
|
2014-10-22 16:43:42 -07:00 |
|
hornygranny
|
c0b1abac9d
|
Merge pull request #5409 from paprka/autoinjectorsgetfixed
Removes opencontainer flag from medipens
|
2014-10-22 14:42:12 -07:00 |
|
hornygranny
|
a54fc8ef73
|
Merge pull request #5410 from phil235/bookcarvingIconFix
Books keep their original icon when carved.
|
2014-10-22 14:41:57 -07:00 |
|
Hornygranny
|
72a8a82c7e
|
Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity
Conflicts:
code/modules/mob/living/living.dm
|
2014-10-22 13:26:35 -07:00 |
|
phil235
|
3a5eb0c1dc
|
Adding a message to the pandemic computer whenever it cannot detect a virus in the blood sample (either due to stealth or actual lack of virus). This will make stealth virus less confusing to players.
|
2014-10-22 22:08:57 +02:00 |
|
phil235
|
a4d707f00f
|
Also fixing the end() proc for pyroplastic anomaly.
|
2014-10-22 21:00:38 +02:00 |
|
phil235
|
e73abf676f
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into AnomalyFix
|
2014-10-22 20:54:35 +02:00 |
|
xxalpha
|
a5450b0acb
|
Finishes repathing flashes
|
2014-10-22 19:09:43 +01:00 |
|
hornygranny
|
79c61500f1
|
Merge pull request #5399 from phil235/LaserGunFix
Fixes the lasergun icon never being empty.
|
2014-10-22 10:53:49 -07:00 |
|
phil235
|
2a0eeea1fb
|
Fixes two anomaly bugs. One: bluespace anomaly doing translocation despite being destroyed. Two: anomaly not checking for the signal code.
|
2014-10-22 17:39:09 +02:00 |
|
hornygranny
|
16d299e5c5
|
Merge pull request #5379 from optimumtact/revertclick
Revert my click cooldown changes
|
2014-10-21 18:39:21 -07:00 |
|
phil235
|
1ed3d50db2
|
Fixes the book changing icon when carved.
|
2014-10-21 23:51:41 +02:00 |
|
paprka
|
fdc3dfc85b
|
Removes opencontainer flag from medipens
|
2014-10-21 13:53:27 -07:00 |
|
Cheridan
|
a5e3851b99
|
Merge pull request #5216 from phil235/bodybagfix1
closets can no longer contain a near infinite amount of mobs.
|
2014-10-21 12:15:30 -05:00 |
|
hornygranny
|
e556867a58
|
Merge pull request #5277 from paprka/newshotguns
Adds improvised shotguns and fixes paths for wrap paper
|
2014-10-21 09:51:35 -07:00 |
|
phil235
|
c2fcd21499
|
Adding bluespace bodybags. Adding changelog.
|
2014-10-21 17:27:40 +02:00 |
|
phil235
|
56c853f9d6
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1
Conflicts:
code/modules/mob/living/simple_animal/friendly/mouse.dm
|
2014-10-21 15:58:39 +02:00 |
|
phil235
|
ebabe9af3a
|
Fixes the lasergun icon never being empty.
|
2014-10-21 15:36:18 +02:00 |
|
paprka
|
c4668885ec
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into cooljackets
Conflicts:
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
|
2014-10-20 21:38:39 -07:00 |
|
paprka
|
74dfbeb92c
|
adds bomber and leather jackets
|
2014-10-20 21:36:40 -07:00 |
|
hornygranny
|
20329a3bdb
|
Merge pull request #5240 from paprka/assantag
Assistant antagonist config option
|
2014-10-20 20:19:08 -07:00 |
|
hornygranny
|
1c9c6d5950
|
Merge pull request #5249 from phil235/DisplacedGirderFix
Fix for #4602
|
2014-10-20 20:18:06 -07:00 |
|
hornygranny
|
8553f8765b
|
Merge pull request #5280 from Jordie0608/increasingquizzicality
Adds adminmoreinfo to Syndicate and Centcomm messages
|
2014-10-20 20:05:22 -07:00 |
|
Cheridan
|
d3b7bd5329
|
Merge pull request #5303 from hornygranny/howdoespolarbearknowwhatapplesis
nonhumans can no longer write
|
2014-10-20 22:05:01 -05:00 |
|
hornygranny
|
9c975b3018
|
Merge pull request #5372 from paprka/prisonjumpsuit
Fixes prisoner jumpsuit adjusting
|
2014-10-20 20:01:42 -07:00 |
|
paprka
|
ea591b26dc
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonjumpsuit
Conflicts:
icons/mob/uniform.dmi
|
2014-10-20 19:48:27 -07:00 |
|
hornygranny
|
1bba60d17f
|
Merge pull request #5346 from Incoming5643/clumpingmystyle
Returns the missing grassclump icon
|
2014-10-20 19:39:43 -07:00 |
|