Commit Graph

14930 Commits

Author SHA1 Message Date
Ikarrus
15c10dd427 Preserve Objectives when admin-removing antag status
Sometimes admins want to change someone's antag type or simply refresh their antag status to fix bugs, while still preserving their objectives.  Being forced to lose them makes these really frustrating to do!

Admins can still manually remove their objectives from the same window (Mind Window/Traitor Panel).
2015-03-01 21:08:14 -07:00
Cheridan
9f62e2c387 Merge pull request #8055 from xxalpha/xxmas
Removes Santa Hats from security wardrobe closets and the festivus pole from RD's office.
2015-03-01 20:04:52 -06:00
Remie Richards
14d5b559c7 Merge pull request #8072 from MrStonedOne/isee-saidtheblindman
Fixes #772 Toggling darkness off prevents ghosts from seeing one another
2015-03-01 22:01:35 +00:00
Swag McYolosteinen
ba3b161572 Merge pull request #8043 from Mandurrrh/kelvingrammar
Fixes  #7935 correct use of Kelvin without degrees.
2015-03-01 20:55:22 +01:00
MrStonedOne
64851a016f Adds blob overmind cursor mob to ghost darkness vision
Thanks @Ricotez

Also tweaks the wording of related verbs, procs, and variables to match

Moves the scope of the ghostimages (now ghost darkness images) var and updatedateallghostimages proc to the global space so other things can access them
2015-03-01 04:07:10 -08:00
Razharas
e505acf591 Merge pull request #7985 from Jordie0608/tgstationisaparadiseforlumberjacks
Cleanup of changelog related files
2015-03-01 13:20:33 +03:00
Razharas
245f661607 Merge pull request #7725 from Steelpoint/Derelict
[MAP] Derelict Update
2015-03-01 06:53:49 +03:00
Razharas
111cb2a009 Merge pull request #8018 from phil235/BugFixA
A bundle of fixes
2015-03-01 06:44:02 +03:00
Razharas
960cc8dff6 Merge pull request #8021 from RemieRichards/AltClick-PixelPlacement-InteractionFix
Table-Item Pixel Placement Improvements
2015-03-01 06:42:44 +03:00
Razharas
1a311c2434 Merge pull request #8047 from optimumtact/patch-1
compile your shit they say
2015-03-01 06:21:11 +03:00
Remie Richards
90a2385c41 Merge pull request #8049 from TheVekter/shotglassfixv3
Re-adds the shot glass sprites
2015-03-01 01:47:12 +00:00
MrStonedOne
a26839cde0 Adds a new ghost verb to toggle ghost visibility
For users who depended on the old buggy version of see darkness.

reworks seedarkness logic to mash well with the new verb, looks nicer too
2015-02-28 13:43:55 -08:00
Remie Richards
88cc21cb6d Merge pull request #7963 from Incoming5643/manage_ass
Updates Manage Job Slots to work with assistant slots
2015-02-28 21:28:44 +00:00
Remie Richards
679c63a8ea Merge pull request #7924 from Incoming5643/mulligan_rounds
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
MrStonedOne
ef95d03a13 fixes runtime when client disconnects while a ghost. 2015-02-28 13:16:04 -08:00
MrStonedOne
ff1a0d3ecd Moves global var ghostimage over to a static var on ghosts 2015-02-28 10:35:20 -08:00
MrStonedOne
0257dbfc9a Fixes #772 Toggling darkness off prevents ghosts from seeing one another.
Abuses client.images to get around the issue with flat see_invisible scaling not allowing for both being able to see ghosts while not seeing darkness layers.
2015-02-28 10:12:16 -08:00
Remie Richards
8cee97f54f Merge pull request #7942 from dannno/nothingmatters
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
danno "big fucking moron" gonzales
49fc3d290c move alt_desc to obj/item/clothing 2015-02-28 11:02:58 -05:00
Razharas
4475f541b9 Merge pull request #8033 from TheVekter/medbackpacks
Gives Medical professions and Botany unique backpacks and satchels
2015-02-28 08:42:20 +03:00
Razharas
926c2f7413 Merge pull request #8027 from Iamgoofball/patch-36
I apparently added morphine to Deus. This was not intended.
2015-02-28 07:00:27 +03:00
Razharas
1b866bad83 Merge pull request #8024 from Iamgoofball/patch-35
Fixes the meth recipe
2015-02-28 06:59:56 +03:00
TheVekter
52c5abd536 Adds new backpacks to job lockers also changelog 2015-02-27 20:26:17 -06:00
TheVekter
b794cf5211 New Botany backpack and satchel. Also fixes satchel spawning without iconstate. 2015-02-27 20:02:24 -06:00
Remie Richards
2a41879f8b Merge pull request #7989 from MrStonedOne/graytideworldwide
Makes rainbowtide a config option.
2015-02-28 01:25:19 +00:00
xxalpha
7859dd2fdf Removes Santa Hats from security wardrobe closets and other. 2015-02-28 01:01:19 +00:00
TheVekter
f6e18e9e45 Re-adds the shot glass sprites. 2015-02-27 17:14:50 -06:00
Orange Borg
d56782f645 compile your shit they say
Don't kill me they say
2015-02-28 10:26:38 +13:00
dannno
2474e84299 REALLY FIXED THIS TIME LOL 2015-02-27 15:59:50 -05:00
Mandurrrh
7d22f4bdbd Fixes #7935 correct use of Kelvin without degrees. 2015-02-27 15:39:13 -05:00
dannno
027eccedbc conflicts fixed 2015-02-27 14:01:42 -05:00
Mandurrrh
d2f44872aa Adds emp, emag, and repairs for barsign. 2015-02-27 12:01:09 -05:00
Razharas
b233b54cab Merge pull request #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers
Panic bunker + new player notification configs
2015-02-27 16:17:20 +03:00
Razharas
e0aa321ca0 Merge pull request #8037 from paprka/blackchowder
Fixes dark matter server crashing, retools dark matter to be less bad
2015-02-27 15:30:17 +03:00
paprka
8807c433ae modifies dark matter 2015-02-27 04:21:56 -08:00
Razharas
12e4047cbe Merge pull request #7988 from Menshin/protalathe_matcheck_fix
Fixes protolathe incorrectly checking material amount
2015-02-27 11:11:52 +03:00
Razharas
78e504f33e Merge pull request #7994 from Incoming5643/colormesurprised
Fixes podmen always being sickenly off white upon creation
2015-02-27 11:10:55 +03:00
Razharas
0367c378bf Merge pull request #8007 from Delimusca/chemheatrconstfix
fixes heater construction
2015-02-27 11:06:10 +03:00
Razharas
a8cedc14ef Merge pull request #7969 from optimumtact/nanouibeginnings
Auto load required nanoui files on client login
2015-02-27 10:36:13 +03:00
TheVekter
abee661784 Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels. 2015-02-26 23:39:27 -06:00
Iamgoofball
16f319bffd I apparently added morphine to Deus. This was not intended. 2015-02-26 20:27:14 -08:00
Iamgoofball
7a990a0a28 Fixes the meth recipe
phosphorus
2015-02-26 18:22:22 -08:00
MrStonedOne
cf5d5794c7 Adds failed login message for panic bunker. 2015-02-26 16:54:20 -08:00
MrStonedOne
5529222b62 Fixes guests being allowed to connect while panic bunker is active
I was tempted to move all the panic bunker shit to isbanned(), but doing so would mean adding yet ANOTHER query that gets run on every connection, and run for every player on world restart.

That just seemed like not worth the effort to just make panic bunker trigger a little bit earier.
2015-02-26 16:48:43 -08:00
MrStonedOne
af4c2d86d6 Tweaks panic bunker verb logic a little bit
Allows toggling even if the database is not connected, alerts admins instead.
2015-02-26 16:02:26 -08:00
Remie Richards
9c6278030f Merge pull request #8012 from MrStonedOne/TeaForTheEmmSee
Fixes subsystems firing way too fast at round start.
2015-02-26 23:48:10 +00:00
Remie Richards
f7d3692a6b Clamps the value of pixel placed items between -(world.icon_size/2) and world.icon_size/2, so -16 and 16 respectively. 2015-02-26 23:17:59 +00:00
MrStonedOne
b39f120f4b Makes the irc new player alert option behave like irc admin pm notices
It will only trigger if the new player alert is enabled for admin display and no valid non-afk admins are on to see it.
2015-02-26 14:07:56 -08:00
dannno
9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno
23ecfeebf8 THE OWL RETURNS: PART 4: PRODUCT PLACEMENT
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
2015-02-26 16:36:44 -05:00