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
LetterJay
dc2140a88d
Update paper.dm
2017-09-30 02:15:40 -05:00
kingofkosmos
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
CitadelStationBot
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
LetterJay
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
