Zuhayr
69b397b5c4
Compile fix.
2014-07-26 01:42:05 +09:30
Zuhayr
b32bbf8d2c
Merge pull request #5741 from mwerezak/wound-infections
...
Attempts to prevent ninja infections, body temperature fix, icon fix
2014-07-26 01:30:12 +09:30
Zuhayr
d8336061b4
Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev
2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e
Merge resolution with PDA nanoui.
2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92
Merging.
2014-07-25 22:50:35 +09:30
Zuhayr
ea8b08c49b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b
Hydroponics rewrite, details will be in PR. Big commit.
2014-07-25 22:16:04 +09:30
Zuhayr
7fb8f30cc7
New machines, adjusted Cael's seeds, rewrote space vines.
2014-07-25 22:15:33 +09:30
DJSnapshot
2c7bb6c48d
Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.
2014-07-24 17:01:52 -07:00
mwerezak
79d4c444c2
Merge remote-tracking branch 'upstream/dev' into power-net
...
Conflicts:
code/ATMOSPHERICS/components/binary_devices/pump.dm
code/game/machinery/alarm.dm
code/game/machinery/spaceheater.dm
2014-07-24 16:04:41 -04:00
Loganbacca
31fe0d5e34
Cargo train fixes
...
- Visual tweak for mobs on trolleys
- Fixed a teleportation bug when boarding trains from other trains
- Fixed a runtime involving on_click code
2014-07-24 20:14:58 +12:00
Loganbacca
1b1e4bc118
Cargo train update
...
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
2014-07-24 18:01:10 +12:00
DJSnapshot
bb336b7691
temporary fix for #4907
2014-07-23 21:48:32 -07:00
DJSnapshot
f8d478fcbb
Updates to gun targeting UI. Fixes #5710
2014-07-23 20:51:58 -07:00
mwerezak
78e4e259db
Fixes icons not being updated for necrosis
2014-07-23 22:41:52 -04:00
mwerezak
d9f70c2fd2
Adjusts the rate that infections deal toxin damage
2014-07-23 22:35:04 -04:00
mwerezak
60c6a2ea92
Fixes fever temperature not being reached
2014-07-23 22:34:04 -04:00
Mark Aherne
d0e01f70cc
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-23 21:58:13 +01:00
Chinsky
db95401506
Merge pull request #5735 from Mloc/bs12-power
...
XGM gas mixtures
2014-07-23 21:05:56 +04:00
Mark Aherne
c3f62d4f52
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-23 14:37:10 +01:00
Zuhayr
61d38a3e86
Merge pull request #5740 from Ccomp5950/taser_slow_down
...
Tasers will now cause movement slow downs on the first hit
2014-07-23 17:46:55 +09:30
Ccomp5950
fe9785d630
Tasers will now cause movement slow downs on the first hit
...
Before: Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.
After: If you have any halloss you will slow down some. I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
2014-07-23 02:55:37 -05:00
Ccomp5950
98abc5bfc4
Compromise on speach_sound, will check distance instead of just checking if ghost.
2014-07-23 01:48:48 -05:00
Ccomp5950
477d32ff64
Ghosts will no longer hear clientless mobs random talking unless they are in view.
...
Experiment 97B says, 'EHEHEHEHEHEHEHE!'
2014-07-22 19:33:56 -05:00
Ccomp5950
75803c5140
Positronic brains (and every other mob) using binary chat will no longer send their messages twice.
...
Fixes : #5444
2014-07-22 19:32:52 -05:00
Ccomp5950
e01e081cbb
screen_shake (meteors, etc.) made more robust and works with aiEyes
...
Before: multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.
Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.
Test: Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.
Yay.
2014-07-22 19:05:04 -05:00
Ccomp5950
11ab2ec412
Chem Master won't resize it's window by adding a scroll bar on selection.
...
Fixes #5574
2014-07-22 18:33:54 -05:00
Mloc-Argent
deb923ec70
added debugging verb support for gas_data
...
Updates mod_list() with associative editing support.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 22:54:12 +01:00
Mloc-Argent
3d390998f1
make gas mask filtering more generic
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 20:31:20 +01:00
Mloc-Argent
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
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
