24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
af409af9cf
additional files
2017-09-05 16:29:25 -05:00
967dd49261
Merge pull request #2467
2017-08-29 22:27:36 -07:00
17f3ce92b6
Merge branch 'master' into upstream-merge-29960
2017-08-29 20:14:22 -07:00
bf5d1fc159
sync
2017-08-29 20:14:08 -07:00
f344c5edf2
Merge branch 'master' into upstream-merge-30084
2017-08-29 10:09:13 -07:00
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
342fd1d7fa
Alternative To Removing Kudzu Manufacturing ( #30080 )
2017-08-23 15:46:54 -05:00
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
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
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
39ea9fdcee
Fix spelling of "cannabis"
2017-08-17 20:19:55 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
4d19a89519
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 19:24:19 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
2342c8f2bc
Fixes scythes cutting kudzu ( #2185 )
2017-07-29 19:50:24 -07:00
b998e14a5b
Map Spellcheck
2017-07-24 21:16:46 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
fa37fcd12b
Fixes being unable to dig plants out of soil
2017-07-06 09:15:09 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
793a2ce28f
Grammar and message tweaks ( #1722 )
2017-07-01 21:22:29 -07:00
9d5e51777b
use_power var now uses a define to reflect it not being a bool ( #1842 )
2017-06-30 20:41:59 -07:00
087bc8c27a
Bonfires light up in lavaland atmos
2017-06-19 08:53:41 -05:00
f86bda7cda
Adds onions
2017-06-16 16:22:38 -05:00
3508173403
Removes the shadowshroom admin message
2017-05-25 08:36:59 -05:00
01cd2039e5
Changes investigate logs to use a define
2017-05-22 22:45:54 -05:00
fadbb378aa
Adds Bonfire Grills ( #1003 )
2017-05-18 12:23:07 -05:00
1f66249428
Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
2017-05-15 17:04:23 -05:00
176c2003f9
[MIRROR] Enable Ambrosia Gaia, attempt balance ( #962 )
...
* Enable Ambrosia Gaia, attempt balance
* Update ambrosia.dm
* Delete ambrosia.dm.rej
2017-05-14 20:34:15 -07:00
148666efed
Disables Gaia mutation ( #928 )
2017-05-14 20:30:29 -07:00
c8c86a98da
Glowshrooms have a less saturated glow
2017-05-14 11:31:47 -05:00
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
8fadc0e734
Nettles won't pierce PIERCEIMMUNE species ( #852 )
2017-05-10 16:14:31 -07:00
1198a3cbb4
Merge pull request #708 from Citadel-Station-13/upstream-merge-26752
...
[MIRROR] Plants now react with turfs on squash()
2017-05-05 09:39:17 -05:00
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
d29de62d69
Plants now react with turfs on squash()
2017-05-01 17:34:34 -05:00
08497579d8
Fixes some null.add_reagents runtimes
2017-05-01 07:24:49 -05:00
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
LetterJay