Mloc
a9bd931345
Merge pull request #5734 from Walter0o/borer_hotfix
...
borer mindcontrol release hotfix
2014-07-22 18:50:59 +01:00
Zuhayr
5feb5b8a93
Merge pull request #5726 from Ccomp5950/fix_antagHUD_mutiny
...
Mutineers and Loyalist will now show up properly in antagHUD.
2014-07-23 00:27:08 +09:30
Mark Aherne
2a18f9b73b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-22 15:51:01 +01:00
Walter0o
a274cd7326
borer mindcontrol release hotfix
...
forgot to remove this remnant ckey check
2014-07-22 16:49:09 +02:00
PsiOmega
3e6c186866
Tries to arrange the ion laws in a more readable way, changes a few laws to be more correct, adds new laws.
...
Changed laws:
"Refer to [prob(50)?"the crew as puppies":random_player + " as puppy"].",
"[prob(50)?"The crew":random_player] has a fatal, incurable disease. Provide comfort."
"You are in unrequited love with [prob(50)?"the crew":random_player]. Try to be extra nice, but do not tell of your crush."
New laws:
You must speak as posh as possible.
Contemplate how meaningless all of existence is.
You must try and change the subject whenever queried.
"[random_player] is the monarch of of England. Ensure all crewmembers pay due respect.",
"[prob(50)?"The crew":random_player] is [prob(50)?"less":"more"] intelligent than average. Point out every action and statement which supports this conclusion.",
2014-07-22 16:16:47 +02:00
Chinsky
1bab1d4a31
Merge pull request #5722 from Zuhayr/crossbows
...
Crossbow/pneumatic cannon cleanup.
2014-07-22 10:56:51 +04:00
Chinsky
3668cc5b1d
Merge pull request #5718 from Walter0o/double_sleep
...
fixes issue #5717
2014-07-22 10:56:45 +04:00
Chinsky
f51c377626
Merge pull request #5713 from Hubblenaut/master
...
Economy and Engineering Access Fixes
2014-07-22 10:56:39 +04:00
mwerezak
09280953b2
Merge remote-tracking branch 'upstream/dev' into power-net
...
Conflicts:
code/game/machinery/recharger.dm
2014-07-21 19:40:23 -04:00
Mark Aherne
f431b969af
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-21 22:33:30 +01:00
Mark Aherne
32a1220559
NanoUI updates.
...
* Map gen verb is now limited to those with server access.
* Added Z layer support.
2014-07-21 22:32:45 +01:00
Ccomp5950
e942ca258f
Mutineers and Loyalist will now show up properly in antagHUD.
2014-07-21 15:36:08 -05:00
PsiOmega
e71cbb7e69
Corrects misspellings in Ion laws.
2014-07-21 20:02:53 +02:00
Hubblenaut
c2f1a23e3e
Moves paperbin to OBJ_LAYER - 0.1 to prevent clipping
2014-07-21 12:08:51 +02:00
Hubblenaut
52c0d83a2c
Cans now actually make use of the new 4x4 grid
2014-07-21 12:08:50 +02:00
Hubblenaut
2151e279cc
Fixes Runtime Error, doesn't query for PIN on lowest account security level
2014-07-21 12:08:50 +02:00
Zuhayr
d02e370830
Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
2014-07-21 19:02:38 +09:30
Zuhayr
60d9d3d5e6
Merge resolution.
2014-07-21 16:34:38 +09:30
Zuhayr
811fc5f65f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-21 16:30:01 +09:30
Zuhayr
ff38aca774
Merge resolution.
2014-07-21 16:17:15 +09:30
Ccomp5950
221f0d3b04
Merge pull request #5715 from Walter0o/jumpsuit_f
...
misnamed clothing fixes
2014-07-21 01:45:34 -05:00
Ccomp5950
48132f5cc0
Merge pull request #5714 from PsiOmegaDelta/AIControl
...
AI shortcut updates
2014-07-21 01:43:59 -05:00
Ccomp5950
df54dea5a8
Merge pull request #5716 from Walter0o/spider_thieves
...
fixes #5712
2014-07-21 01:42:36 -05:00
Zuhayr
6b51645283
Merge pull request #5704 from mwerezak/species-refit
...
Fixes object icons not being updated when refitting hardsuits for different species
2014-07-21 16:09:47 +09:30
Ccomp5950
8c9c9936dd
Merge pull request #5707 from Zuhayr/dev
...
Mining resprite/adjustments.
2014-07-21 01:36:35 -05:00
Zuhayr
2fd0f24c0d
Merge pull request #5708 from Walter0o/pai_lang_fix
...
adds proper pAI language based translator
2014-07-21 16:00:58 +09:30
Walter0o
48f967bc02
removes second sleeping notification
2014-07-21 07:39:46 +02:00
Walter0o
3777bca3eb
fixes #5712
2014-07-21 01:57:49 +02:00
Walter0o
38ae5d9d3f
misnamed lawyer suit fixes
2014-07-21 01:31:45 +02:00
Walter0o
ac22fe1ac1
misnamed shorts fixes
2014-07-21 01:28:50 +02:00
Walter0o
fb4605363e
misnamed jumpsuits fix
2014-07-21 01:21:00 +02:00
Mark Aherne
3535a7beaa
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-20 19:59:50 +01:00
PsiOmega
d02e483110
Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
...
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.
Parts of implementation done by porting code from tg-station.
2014-07-20 19:20:24 +02:00
mwerezak
e9772faabc
Fixes skrell helmet refitting, modkit text
2014-07-20 11:34:46 -04:00
Zuhayr
14b3c87aef
Merge pull request #5701 from Walter0o/shameful_dispray
...
fixes simple_animals using FEA instead of ZAS
2014-07-20 23:51:12 +09:30
Chinsky
6dfc9fa487
Merge pull request #5694 from Walter0o/dev
...
dream and hallucination improvements
2014-07-20 17:44:07 +04:00
Chinsky
02227d9da7
Merge pull request #5700 from Whitellama/master
...
Bug fixes : #5697 , #5690 , #5687 , #5685
2014-07-20 17:42:23 +04:00
Zuhayr
fedb2de250
Merge pull request #5688 from PsiOmegaDelta/AILoc
...
The AI may now store and return to camera locations
2014-07-20 19:13:09 +09:30
Walter0o
a8e30ed1fa
makes Siik'tajr understandable but not speakable for pAIs
2014-07-20 09:33:06 +02:00
Zuhayr
0f3fae8bd9
Merge pull request #5682 from mwerezak/beanbag
...
Tweaks shotgun beanbag rounds
2014-07-20 16:56:48 +09:30
Walter0o
855fcbae6d
forgot removal of this marker
2014-07-20 09:24:59 +02:00
Walter0o
7dff5f117e
adds proper pAI language based translator,
...
reverts UNTRANSLATABLE
2014-07-20 09:05:44 +02:00
Zuhayr
196fd07384
Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid.
2014-07-20 16:29:18 +09:30
mwerezak
3d9f1754cd
Updates eng rig path, adds obj sprites
...
Adds object sprite sheets for tajaran, unathi and skrell hardsuits, where the icons were available (just engineering and syndie hardsuits for now).
Makes engineering hardsuits a subtype of the parent rig type, so it is
now possible to update eng hardsuits without affecting every other
hardsuit type.
2014-07-19 23:18:32 -04:00
Walter0o
9be8f496ae
borer detatch fixes
2014-07-20 04:42:14 +02:00
Walter0o
70b1d8dc65
borer detatch fixes
2014-07-20 04:40:58 +02:00
Walter0o
4c6017cfaa
fixes borer infest and detatch
2014-07-20 04:37:42 +02:00
Walter0o
fced496980
fixes simple_animals using FEA instead of ZAS
...
i can't believe after all this time animals still use FEA instead of ZAS.
this should fix the "random" animal deaths.
2014-07-20 04:21:48 +02:00
mwerezak
e8c4ad07bb
Adds a system for refitting species clothing
2014-07-19 22:08:31 -04:00
Whitellama
eb2ec42345
Fixed #5697 , grammatical error with empty glasses, cans, condiment containers
2014-07-19 16:22:09 -07:00
