Commit Graph
100 Commits
Author SHA1 Message Date
XDTMandCitadelStationBot 493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
CitadelStationBotandPoojawa 913e94c128 [MIRROR] Black Fedora opens its inventory on-click like the Detective's Fedora (#5689)
* Black Fedora opens its inventory on-click like the Detective's Fedora (#35891)

* Black Fedora opens its inventory on-click like the Detective's Fedora

Instead of having to drag the sprite to your character to access its inventory, behaves the same as the Detective's Fedora opening its container on click. Considering some dets prefer the black variation for noir flavour rather than the brown standard one they just have to pass his flask from one hat to another.
I had either this in mind or creating a new black detective's fedora variant on the det's cabinet that also had the flask inside it.

The only other item affected by this, if I'm not mistaken, is the improper CentCom hat.

* Update internal.dm

Removed the <priority> line altogether to trim the code

* Black Fedora opens its inventory on-click like the Detective's Fedora
2018-02-24 07:02:57 -06:00
CitadelStationBotandPoojawa 099157b8ff [MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666)
* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
2018-02-22 23:43:23 -06:00
CitadelStationBotandPoojawa 359a500e79 [MIRROR] New Donkpocket Box (#5641)
* New Donkpocket Box (#35835)

cl Jittai / ChuckTheSheep
imageadd: NT has stopped buying re-boxed storebrand Donkpockets and now stocks stations with real, genuine, tasty Donkpockets!
/cl

RIP: #35601
I was asked to throw together some icons for donk baggies, but had some fun making the box.

* New Donkpocket Box
2018-02-21 19:45:23 -06:00
vuonojenmustaturskaandCitadelStationBot 6ed9b30987 Merge pull request #35751 from Xhuis/crewpointer
Crew pinpointers now fit on medical belts
2018-02-18 11:33:47 -06:00
Jordan BrownandCitadelStationBot f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
TehZombehzandCitadelStationBot 326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
deathride58andGitHub 4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
TehZombehzandCitadelStationBot 1346e88e6b Fix for invisible heartboxes 2018-02-13 18:08:38 -06:00
orangesandCitadelStationBot e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBotandGitHub 51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456
[MIRROR] [s] Fixes altclick exploits
2018-02-11 09:43:09 -06:00
KorPhaeronandCitadelStationBot e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-11 05:13:46 -06:00
ShizCalevandCitadelStationBot f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan BrownandCitadelStationBot fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan BrownandCitadelStationBot bbf970c213 Merge pull request #35409 from epochayur/master
Belts now have inhand sprites
2018-02-07 23:48:17 -06:00
CitadelStationBotandPoojawa 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBotandPoojawa a5d1cae1ac [MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313)
* Fixes smugglers satchels being able to refresh items forever (#35270)

* Fixes smugglers satchels being able to refresh items forever
2018-02-05 00:48:12 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
81DentonandCitadelStationBot 547a80eb22 [Ready] Rebalances Chameleon Kits for lowpop (#34972)
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
2018-01-27 23:21:06 -06:00
coiaxandCitadelStationBot 481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
MrDoomBringerandCitadelStationBot 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Jordan BrownandCitadelStationBot 66bc684184 Merge pull request #34552 from Robustin/revert3
All crew can purify the Blood Bastard Sword (again)
2018-01-18 16:59:39 -06:00
orangesandCitadelStationBot 8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 04:23:03 -06:00
LeoandCitadelStationBot d8bcc0190d Merge pull request #34170 from ShizCalev/bbs-unholy
Fixes non-holy mobs purifying BBS
2018-01-10 03:12:16 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJayandGitHub 4599680f68 Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
[MIRROR] Internal radio implant
2017-12-30 05:03:48 -06:00
LetterJayandGitHub 2d9a70a487 Update uplink_kits.dm 2017-12-29 18:42:44 -06:00
LetterJayandGitHub a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
Tad HardestyandCitadelStationBot 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
coiaxandCitadelStationBot 866318e33e Internal radio implant 2017-12-29 02:52:24 -06:00
orangesandCitadelStationBot 269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay 2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
LetterJayandGitHub ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan BrownandCitadelStationBot 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
QualityVanandCitadelStationBot 5869eae8e9 Fixes some syndicate duffelbags missing inhands 2017-12-20 19:54:56 -06:00
XDTMandCitadelStationBot 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
vuonojenmustaturskaandCitadelStationBot 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58andGitHub 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
Jordan BrownandCitadelStationBot 70be12aa1c Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 15:52:53 -06:00
XDTMandCitadelStationBot 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
deathride58 f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
RobustinandCitadelStationBot 786c26fa97 Ratvar will now bitchslap BOH babies (#33159)
* Singuloproofing Reebe

* Message reformatted

* Inconsistent Indentification

* user is now living so we can knock them down
2017-12-01 11:58:30 -06:00
LeoandCitadelStationBot 5b45f66677 Merge pull request #33099 from jughu/Powercreep-till-the-end
Allows toolbelts to carry geiger counters
2017-11-27 08:20:18 -06:00
LetterJayandGitHub eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00