Zuhayr
505d84049c
Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.
2014-12-28 19:16:07 +10:30
Zuhayr
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
Zuhayr
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
Zuhayr
cc00fa3d52
Fixes and tweaks to the previous.
2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3
Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)
2014-12-23 17:38:05 +10:30
mwerezak
c554f70d88
Fixes colour mix up
...
Somehow phoron got the colour meant for inaprovaline.
2014-12-13 17:54:30 -05:00
PsiOmegaDelta
0bba4e6f68
Merge pull request #7441 from sabiram/dev-freeze
...
Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.
2014-12-13 14:59:41 +01:00
mwerezak
6aa2c09fcf
Replaces dummy reagent colours
2014-12-12 16:06:16 -05:00
sabiram
953f365292
Adds 'me' hotkey again. Pedantic spelling changes.
2014-12-12 15:44:22 -05:00
Zuhayr
bc394b72d6
Fixes diona and simple_animals eating snacks.
2014-12-09 22:14:41 +10:30
PsiOmega
957ff8314d
Cargo can now order empty blood packs.
2014-11-30 16:45:52 +01:00
PsiOmega
7386a881d7
Merge remote-tracking branch 'upstream/master' into dev
2014-11-25 10:33:47 +01:00
Zuhayr
a63ec86871
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-11-24 08:58:30 +10:30
GinjaNinja32
fbce3cba4b
Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys
2014-11-23 18:57:42 +00:00
Zuhayr
5568ed15c1
Randomizes strange seed icons, fixes poppies.
2014-11-23 10:15:15 +10:30
Zuhayr
2b4cd94650
Merge resolution.
2014-11-19 23:28:09 +10:30
Zuhayr
660b32629e
Merge resolution.
2014-11-19 23:19:33 +10:30
Zuhayr
425aaf1cba
Merge pull request #7047 from mwerezak/sliceable
...
Fixes inverted slicing check
2014-11-19 23:13:16 +10:30
mwerezak
3a83a31440
Merge remote-tracking branch 'upstream/dev' into sliceable
...
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm - caused by whitespace :/
2014-11-16 22:25:50 -05:00
mwerezak
2e222523e1
Fixes inverted slicing check
2014-11-16 22:13:17 -05:00
mwerezak
9eb6dfdef4
Fixes #7026
...
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
Amunak
4a845beb7d
corrects volume shown in description of beakers
2014-11-16 20:33:25 +01:00
Zuhayr
4d64a11acd
Manual merge of head.dmi.
2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5
Moved everything to a module-based hardsuit system.
...
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
Chinsky
43ee395c48
Merge pull request #7013 from Raptor1628/dev
...
ERT Update
2014-11-14 11:18:50 +03:00
Zuhayr
31b6cc19ad
Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.
2014-11-13 21:41:02 +10:30
Zuhayr
90d65aed57
Removed attack_paw, attack_animal and attack_slime.
2014-11-13 17:15:29 +10:30
Raptor1628
ba12d87388
ERT Update
...
Bevy of ERT changes and updates, outlined in a forum thread here:
2014-11-13 01:28:15 -05:00
Chinsky
b964526aa2
Merge pull request #6980 from MagmaRam/drinks
...
Some new drinking glass icons
2014-11-12 23:45:07 +03:00
Zuhayr
b4ea25d064
Merge conflict resolution.
2014-11-10 13:00:06 +10:30
MagmaRam
08c87edd46
Changed glass to cup for tea and coffee to make the sprites more consistent.
2014-11-09 20:00:17 -05:00
MagmaRam
4815bba8fb
Adds sprites for lemon-lime soda, grape soda in a glass, and coffee.
2014-11-09 19:45:53 -05:00
Chinsky
90cb5f5363
Merge pull request #6962 from GinjaNinja32/drinks
...
Move glass appearance into reagent datums
2014-11-08 11:10:48 +03:00
Chinsky
4230a20c45
Merge pull request #6963 from mwerezak/sliceable
...
Rewrites food slicing, energy weapons
2014-11-08 11:07:34 +03:00
mwerezak
cc82a47163
Cleans up food slicing
2014-11-07 00:10:49 -05:00
mwerezak
81f8f36874
Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.
2014-11-06 19:50:40 -05:00
GinjaNinja32
7d453ece1f
Move glass appearance into reagent datums
2014-11-06 23:49:07 +00:00
GinjaNinja32
0e41cf9cf0
Fixes Toxins Special having no sprite
2014-11-06 21:04:14 +00:00
Chinsky
8078ffe079
Merge pull request #6939 from PsiOmegaDelta/VerbOptimization
...
Verb optimization
2014-11-05 23:23:56 +03:00
PsiOmega
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
mwerezak
5372b526a1
Merge remote-tracking branch 'upstream/dev' into fire-extinguishers
2014-10-31 20:29:00 -04:00
mwerezak
e549a22bba
Removes world print, re-adds react() call
...
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
2014-10-28 22:13:42 -04:00
mwerezak
85fb8d917c
Sleepers now use power when synthesizing chemicals
...
Also, sleeper and chemmaster power usage are now both controlled by a
constant in setup.dm
2014-10-26 15:10:37 -04:00
mwerezak
a0b47ce4de
Water cools hot turfs even if they do not have a hotspot.
...
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
2014-10-24 21:45:02 -04:00
Graham Lloyd
c764a94073
fixes some annoying punctuation errors.
2014-10-22 15:58:27 -04:00
Zuhayr
d0b3a3a39b
Merge pull request #6601 from Mloc/bs12-calert
...
donut boxes now update their icon to properly reflect their contents
2014-10-06 19:37:24 +10:30
Mloc
9faec14707
donut boxes now update their icon to properly reflect their contents
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-05 19:24:30 +01:00
Zuhayr
6c96f3d66b
Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev
2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5
Merg resolution.
2014-10-02 02:33:06 +09:30
Mloc
61394d3921
fixes #6561
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 22:18:25 +01:00
