GinjaNinja32
116705b61b
Fixes wallets, makes CMC use alt-titles, actually remove dead block
2014-11-21 10:42:52 +00:00
PsiOmega
255b91553b
Merge remote-tracking branch 'upstream/dev' into PAP
...
Fixes #6844 .
2014-11-14 13:33:59 +01:00
Chinsky
0b8236da3b
Merge pull request #7017 from PsiOmegaDelta/SafeResearch
...
Research Safety
2014-11-14 11:21:47 +03:00
Chinsky
2431c930d3
Merge pull request #7007 from mwerezak/helmet
...
Makes helmet icon south state consistent with east/west states
2014-11-14 11:19:29 +03:00
Chinsky
4f81000f6d
Merge pull request #7012 from mwerezak/slime-hear
...
Cleans up slime saycode clutter
2014-11-14 11:18:57 +03:00
Chinsky
43ee395c48
Merge pull request #7013 from Raptor1628/dev
...
ERT Update
2014-11-14 11:18:50 +03:00
Chinsky
1640b0a1c1
Merge pull request #7015 from Zuhayr/attackverbremoval
...
Attack proc removal/refactor.
2014-11-14 11:18:43 +03:00
PsiOmega
7bf33f98e4
Research Safety
...
Research build paths are now type safe. ensuring the object type that is to be constructed always exists.
2014-11-13 12:42:08 +01: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
82090d2de2
Fixed some issues with previous commits, gave aliens and animals an attack proc, removed now-unused stungloves from attack_hand procs.
2014-11-13 21:01:55 +10:30
Zuhayr
4bb4145f5d
Readded interactions for slimes and monkeys using attack_generic proc.
2014-11-13 19:18:34 +10:30
Atlantiscze
59077c5b51
Buildable robot analyzers
...
- Robot analyzers can now be built using Protolathe. They are low-mid level tech, requiring quite small research levels and no rare materials.
2014-11-13 08:45:45 +01:00
Zuhayr
4090f04839
Readded monkey dexterity checks in each attack_hand as appropriate.
2014-11-13 17:46:37 +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
mwerezak
6ceac97a98
Cleans up slime saycode clutter
...
It was cluttering saycode used by every living mob in the game with
something that only applies to slimes.
Also, code that really applies to hearing a message shouldn't have been
mixed up with code for speaking a message.
Really awful.
2014-11-13 01:20:16 -05:00
mwerezak
b7429a76ea
Adds tajaran/unathi tacticool sprite sheets
...
No more clipping into muzzles.
2014-11-13 01:03:29 -05:00
Zuhayr
40e3ea33f6
Merge resolution.
2014-11-13 16:07:16 +10:30
Ccomp5950
701f5feba4
Merge pull request #7001 from atlantiscze/rnd-fix
...
Rnd fix
2014-11-12 23:28:41 -05:00
Ccomp5950
0fa7d59b46
Merge pull request #7004 from mwerezak/stance
...
Cleans up human stance code
2014-11-12 23:24:13 -05:00
mwerezak
f5ccbe5ba7
Cleans up human stance code
...
Merges leg_tally and can_stand, streamlined the stance checks in organ processing.
Removes half-implemented has_limbs (assigned to 1 but never updated anywhere).
Having only one foot now slows you down.
2014-11-12 22:56:55 -05:00
Chinsky
dab47ad163
Merge pull request #6978 from PsiOmegaDelta/SlugsInMyBrain
...
Borers can now cancel out from injecting chemicals.
2014-11-12 23:45:23 +03:00
Chinsky
b964526aa2
Merge pull request #6980 from MagmaRam/drinks
...
Some new drinking glass icons
2014-11-12 23:45:07 +03:00
Chinsky
9e818ef52f
Merge pull request #6983 from PsiOmegaDelta/Event
...
Event Manager Control
2014-11-12 23:45:02 +03:00
Atlantiscze
64b6d6e27b
Removes bluespace crystal RnD datum
...
- Bluespace crystals were removed, but datum was left. Trying to build it causes runtime.
2014-11-12 12:16:13 +01:00
Atlantiscze
d915fb2391
RnD Console Runtime Fix
...
- This will mostly fix runtimes when items are removed and design datums are left behind.
- User now gets option to reset the console, and is told to submit bug report stating which item was being built.
- Also inserts warning into server log.
2014-11-12 12:15:14 +01:00
PsiOmega
7bb5b51954
Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event
...
Conflicts:
code/modules/events/event_manager.dm
2014-11-12 10:18:45 +01:00
PsiOmega
ddc1a617d0
Fixes and event end estimations.
2014-11-12 09:39:54 +01:00
MrSnapwalk
0ff612aea6
Adds Bromuzl's custom item to item_defines.dm.
2014-11-10 19:51:08 -06:00
PsiOmega
0602200dd6
Round-end report.
2014-11-10 19:20:16 +01:00
PsiOmega
ee75aa1fa4
Logging of event changes.
2014-11-10 16:19:51 +01:00
PsiOmega
d4368954dc
Event Manager Control
...
Admins can now:
Pause event start countdown.
Add/Remove events to rotation.
Affect the likelihood of events occurring.
Allow one shot events to fire again.
2014-11-10 15:04:31 +01:00
Zuhayr
e80d294aa5
Compile issues with the merge. PDA tapping may be broken for pAIs.
2014-11-10 13:17:17 +10:30
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
PsiOmega
24be641f5b
Borers can now cancel out from injecting chemicals.
2014-11-09 20:54:41 +01:00
runedog48
8fe3642726
Fixes #6831
...
Observing people with oil-stained clothes no longer states that they're
blood-stained.
2014-11-09 13:14:30 -05:00
runedog48
ee3f670e74
Fixes #6976
...
Sterile Masks now work with the custom loadout.
2014-11-09 12:31:42 -05:00
runedog48
457e398dac
Fixes #6957
2014-11-08 18:11:35 -05:00
Chinsky
6b0049391f
Merge pull request #6922 from PsiOmegaDelta/TheGreatEvents
...
Random Event Overhaul
2014-11-09 00:02:13 +03:00
Chinsky
82e5cf4b72
Merge pull request #6965 from PsiOmegaDelta/Supply
...
Service personnel radio frequency
2014-11-09 00:02:07 +03:00
Chinsky
57110b4059
Merge pull request #6961 from GinjaNinja32/phoronspecial
...
Fixes Toxins Special having no sprite
2014-11-09 00:00:59 +03:00
PsiOmega
574a8f5570
Completes the basic random event manager.
2014-11-08 18:22:31 +01:00
PsiOmega
bd885164f1
Merge remote-tracking branch 'upstream/dev' into TheGreatEvents
...
Conflicts:
code/global.dm
2014-11-08 10:26:45 +01:00
Chinsky
79a5170325
Merge pull request #6959 from PsiOmegaDelta/StateLaws
...
AI fixes
2014-11-08 11:11:04 +03: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
PsiOmega
4ecc058150
Service personnel get their own radio frequency
...
Bartenders, chefs, and janitors now have their own service frequency and corresponding headset.
The HoP is listening to this channel by default.
Creates a proper locker for the chef's extra gear.
2014-11-07 20:54:57 +01:00
PsiOmega
04661c0240
AI and Topic fixes.
...
Adjusts the AI integrity status, no longer should it report being alive until -100%
Moves the Topic() nowindow check down to the very bottom of /obj/.
2014-11-07 11:10:32 +01:00
