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
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
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
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
Leo
ed3a031543
Merge pull request #31497 from AnturK/cyberboss-pls
...
Fixes some tempremoves
2017-10-10 07:10:35 -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
LetterJay
4a0d3c4d40
Update seed_extractor.dm
2017-10-08 14:35:35 -05:00
LetterJay
cc3bd63d88
Update seed_extractor.dm
2017-10-07 22:51:05 -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
021b0a2bee
Update growninedible.dm
2017-10-01 22:38:55 -05:00
oranges
eeeae1b855
Fixes grown runtime spam
2017-10-01 15:20:07 -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
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
CitadelStationBot
f6dfc177f5
[MIRROR] It's oranges ( #2486 )
...
* It's oranges
* thanks oranges
2017-09-13 17:56:54 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
LetterJay
c46c442896
Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454
...
[MIRROR] Gets rid of manual overlay manipulation
2017-09-11 15:21:43 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -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
tortellinitony
d73b82cf11
Gets rid of manual overlay manipulation
2017-09-06 23:39:08 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
LetterJay
af409af9cf
additional files
2017-09-05 16:29:25 -05:00
kevinz000
967dd49261
Merge pull request #2467
2017-08-29 22:27:36 -07:00
