deathride58
5dc3f29ad4
modules - E to L
2018-01-04 00:53:38 -05:00
YPOQ
8bf721d5b7
Fixes plant juicing ( #33896 )
2017-12-29 02:56:22 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
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
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
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
Jordan Brown
70be12aa1c
Merge pull request #33241 from swindly/suicide
...
Adds some suicide acts
2017-12-09 15:52:53 -06:00
ACCount
111cb9e5b0
Fixes random in random seeds ( #33362 )
...
* Fixes random in random seeds
* removed kwargs
2017-12-08 12:09:34 -06:00
LetterJay
9849b9a13b
Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482
...
[MIRROR] Improves the deep fryer
2017-11-15 11:13:56 -06:00
vuonojenmustaturska
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
Ashe Higgs
9dff28b50d
Improves the deep fryer
2017-11-13 03:16:11 -06:00
Jordan Brown
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -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
Onule
5bdadb7d4e
Sunflower makeover, adds missing inhands sprites. ( #31728 )
...
* New sunflower sprite, added inhand sprites, first time messing with git
* Updates sunflower and variant's sprites, adds new growing stage sprites for sunflower variants, new inhands sprites.
* Made the leaves a bit higher. Das it
2017-10-15 16:34:01 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
LetterJay
f93733576e
Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
...
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
Mercenaryblue
17795f04c8
Added Banana Peels Inhand Sprites ( #31551 )
...
Added in-hand Banana Peels sprites.
Default, Mime, and Bluespace.
2017-10-12 00:28:51 -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
5ec781502c
Merge branch 'master' into upstream-merge-31116
2017-10-01 15:09:10 -04:00
AnturK
6afd603fe6
Fixes some hardset dna misuse
2017-09-30 14:51:52 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
CitadelStationBot
f6dfc177f5
[MIRROR] It's oranges ( #2486 )
...
* It's oranges
* thanks oranges
2017-09-13 17:56:54 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
kevinz000
967dd49261
Merge pull request #2467
2017-08-29 22:27:36 -07:00
kevinz000
17f3ce92b6
Merge branch 'master' into upstream-merge-29960
2017-08-29 20:14:22 -07:00
kevinz000
bf5d1fc159
sync
2017-08-29 20:14:08 -07:00
kevinz000
f344c5edf2
Merge branch 'master' into upstream-merge-30084
2017-08-29 10:09:13 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
342fd1d7fa
Alternative To Removing Kudzu Manufacturing ( #30080 )
2017-08-23 15:46:54 -05: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
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
CitadelStationBot
39ea9fdcee
Fix spelling of "cannabis"
2017-08-17 20:19:55 -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
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
087bc8c27a
Bonfires light up in lavaland atmos
2017-06-19 08:53:41 -05:00
CitadelStationBot
f86bda7cda
Adds onions
2017-06-16 16:22:38 -05:00
