oranges
3671228196
Merge pull request #34110 from Armhulen/patch-40
...
shadowshroom nerf reverted
2018-01-08 20:07:57 -06:00
deathride58
5dc3f29ad4
modules - E to L
2018-01-04 00:53:38 -05:00
LetterJay
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
YPOQ
8bf721d5b7
Fixes plant juicing ( #33896 )
2017-12-29 02:56:22 -06:00
arsserpentarium
a893559c6b
[READY]Circuitry upgrades
2017-12-24 15:03:45 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -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
LetterJay
8d6d561950
Update beebox.dm
2017-12-17 17:37:53 -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
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
oranges
181afe9640
Fixes the free worker bee getting stuck in the hive and never leaving ( #33451 )
...
ten outta ten code
2017-12-12 15:57:49 -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
deathride58
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
ACCount
111cb9e5b0
Fixes random in random seeds ( #33362 )
...
* Fixes random in random seeds
* removed kwargs
2017-12-08 12:09:34 -06:00
deathride58
a6aa181161
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
...
[MIRROR] Moves some machine sprites into /machines/ folder
2017-12-05 20:37:30 +00:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
oranges
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
deathride58
14ce7c8118
Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994
...
[MIRROR] Updates some item drops to use drop_location()
2017-11-25 05:53:16 +00:00
ShizCalev
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
oranges
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
deathride58
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
ShizCalev
831dde525e
Makes drinking glasses smash when thrown
2017-11-20 02:45:22 -06:00
ShizCalev
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
Dax Dupont
e3f172d999
Fixes hydroponics not properly dealing with fluorine ( #32813 )
...
fluorine was misspelled
2017-11-17 12:50:11 -06:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -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
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
LetterJay
6360be2041
Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883
...
[MIRROR] Removes duplicate typecaches
2017-10-23 20:16:51 -04:00
Jordan Brown
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
YPOQ
082a713848
Composting plants/pills transfers all reagents ( #31923 )
2017-10-22 17:53:24 -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
ShizCalev
77ae7b7724
Corrects soil description
2017-10-17 08:23:21 -05:00
LetterJay
a3396b8fd0
Merge pull request #3431 from Citadel-Station-13/upstream-merge-31747
...
[MIRROR] Removes hardcoded "full bottle" icons from several pre-filled reagent bottles
2017-10-16 10:39:59 -04:00
vuonojenmustaturska
11eff73897
Removes hardcoded "full bottle" icons from several pre-filled reagent bottles
2017-10-16 00:00:52 -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
