Poojawa
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
deathride58
9647de2806
Merge pull request #6328 from Citadel-Station-13/upstream-merge-36788
...
[MIRROR] Fixed paperbin dropping and fingerprints
2018-04-10 07:20:33 +00:00
Davidj361
075a879343
Fixed paperbin dropping and fingerprints ( #36788 )
...
* Removed parent call to stop the paperbin from dropping from being carried when getting a pen or paper.
* Found a better fix
* Better operator
* Fixed fingerprints not being created upon paper bin interaction
* Review change
2018-04-09 14:14:13 -05:00
Poojawa
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines ( #6004 )
...
* Replaced body zone magic strings with defines
* merge conflicts
2018-03-19 21:18:57 -05:00
Ashe Higgs
a7d5e4cdcf
Refactors butchering to a component - item-based butchering effectiveness, speed, and chances ( #35744 )
...
* Butchering component
* auto-butchering based on toolspeed
* Gives drills their butchering back
* redoes toggles
2018-02-25 14:50:29 -06:00
CitadelStationBot
58413c4b54
[MIRROR] Renames various reagent IDs to be more descriptive ( #5634 )
...
* Renames various reagent IDs to be more descriptive (#35824 )
* changes chloral2/beer2 names, fixes chloral2 desc
* reverts chloral2 name/desc, renames ling adrenals
* caPITALIZATION
* Renames various reagent IDs to be more descriptive
* fixes compile issues with Travis
2018-02-24 09:35:48 -06:00
CitadelStationBot
6e28b456ba
[MIRROR] Deletes a redundant double proc definition in paper bins ( #5586 )
...
* Merge pull request #35797 from DaedalusGame/freon-is-back-baybee
Deletes a redundant double proc definition in paper bins
* Deletes a redundant double proc definition in paper bins
2018-02-19 10:21:47 -06:00
oranges
5dc3549801
Merge pull request #35542 from ShizCalev/free-spam-removal
...
Cleans up some duplicate canusetopic warnings
2018-02-15 20:35:03 -06:00
ShizCalev
98bbfb8709
[s]Fixes writing bugs/exploits
2018-02-15 16:10:03 -06:00
deathride58
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
ShizCalev
f4685cfe01
[s] Fixes altclick exploits
2018-02-11 05:08:00 -06:00
Jordan Brown
3076575c34
Merge pull request #35453 from 81Denton/aluminium-with-two-i
...
Aluminium with two i
2018-02-09 12:49:08 -06:00
Dax Dupont
ed18c63441
Holopictures and more! ( #35303 )
...
* Holopictures and more!
* Remiedation
2018-02-07 05:17:41 -06:00
Poojawa
a7f0ffb6f0
modules
2018-01-31 06:56:28 -06:00
Poojawa
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
deathride58
4008898f54
Merge pull request #5054 from Citadel-Station-13/upstream-merge-34829
...
[MIRROR] Removes animation from photos
2018-01-26 15:39:38 +00:00
LetterJay
912fb88cc1
Update stamps.dm
2018-01-24 15:39:45 -06:00
coiax
481f73aba0
Costumes for nuclear operatives
2018-01-24 13:58:35 -06:00
Leo
307465d156
Merge pull request #34819 from ACCount12/unwrenching_standardization
...
Makes photocopier use default_unfasten_wrench
2018-01-24 11:49:39 -06:00
Jordan Brown
0b2f1c2826
Merge pull request #34829 from AnturK/photosnotmovies
...
Removes animation from photos
2018-01-24 06:12:46 -06:00
MrDoomBringer
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
Dax Dupont
c2f5a85394
Adds the camera to the autolathe and changes the materials ( #34636 )
2018-01-21 21:24:18 -06:00
ShizCalev
68cfdb617b
Fixes rev mindswap ( #34567 )
2018-01-21 12:29:12 -06:00
AnturK
89766bdc4e
Makes getFlatIcon slower. (Also more precise) ( #34199 )
...
* getFlatIcon fixes and improvements. DO NOT TOUCH
* Fixes area blendings
* Stuff
* Drops the named arg
2018-01-16 07:33:41 -06:00
deathride58
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
LetterJay
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
LetterJay
bd1c186111
Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181
...
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
2017-12-17 21:26:08 -06:00
deathride58
ede6f432bc
Update pen.dm
2017-12-14 17:24:19 -05:00
Ashe Higgs
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -06:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
deathride58
a6220057be
Update filingcabinet.dm
2017-12-13 16:47:29 -05:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
CitadelStationBot
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
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
oranges
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
LetterJay
5ca3389cc2
Update clipboard.dm
2017-11-12 13:17:59 -06:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
Jordan Brown
1ee238218c
Merge pull request #31931 from vuonojenmustaturska/penfix
...
It's a time to stop warning about paper bins eating pens
2017-10-21 18:53:43 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
Tad Hardesty
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
LetterJay
f1858a3a63
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
...
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
nicbn
078128aa91
Paper markdown ( #30873 )
...
* why it doesn't work
* list thing
* oops
* fixes list. maybe
* Less regex
* wip
* Done I think. I think
* return your functions
* Replace $10 by $a
2017-09-30 08:11:01 -05:00
