Kelenius
d9e2947b32
Updates chemistry colors
2015-04-28 09:23:39 +03:00
Zuhayr
8e0d0900d9
Merge pull request #8875 from PsiOmegaDelta/TheSummoning
...
Destroy/qdel
2015-04-26 22:14:07 +09:30
Zuhayr
173329f675
Merge pull request #8968 from Jarcolr/signed
...
Adds 9 new bar signs.
2015-04-25 03:09:35 +09:30
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
Jarcolr
28c037b6ce
Adds 9 new bar signs.
2015-04-24 17:35:07 +03:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmegaDelta
ee88da4cea
Merge pull request #8966 from Baystation12/master
...
Dev
2015-04-24 09:20:16 +02:00
Chinsky
60e7aacf79
Merge pull request #8951 from Dennok/patch-15
...
floorlayer
2015-04-24 10:04:29 +03:00
Chinsky
e0da322ee3
Merge pull request #8956 from mwerezak/gametime
...
Makes crit oxyloss and malf AI timer run in gametime instead of realtime.
2015-04-24 10:03:06 +03:00
Chinsky
2159045b81
Merge pull request #8879 from Dennok/patch-6
...
Fix speed and add rotate()
2015-04-24 10:01:13 +03:00
Zuhayr
24175051a2
Merge pull request #8961 from mwerezak/limb-augments
...
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
2015-04-24 16:15:16 +09:30
mwerezak
0a7fd34f3f
Limb augments no longer prevent putting on jumpsuits
2015-04-23 11:27:16 -04:00
mwerezak
7a6a54b671
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
...
I haven't heard of any issues on the server about this, but it's probably best to prevent them from being removed.
2015-04-23 08:25:49 -04:00
PsiOmega
b9f8b0b8aa
Re-shuffles huma/say(). Removes non-existing map variables.
2015-04-23 13:36:13 +02:00
PsiOmega
eee67109d1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-04-23 13:15:43 +02:00
PsiOmega
2aa9a70496
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-23 12:59:47 +02:00
Zuhayr
f06326556a
Merge pull request #8838 from Dennok/patch-5
...
Pipelayer
2015-04-23 20:03:20 +09:30
Dennok
dfa0735c1d
Remove .contents in loop.
2015-04-23 11:59:34 +03:00
mwerezak
7a8ae91c6a
Makes crit oxyloss and malf AI time run in gametime instead of realtime.
2015-04-23 04:42:58 -04:00
Zuhayr
c7ec25e8f8
Merge pull request #8855 from comma/soundenv
...
Sound environments
2015-04-23 17:04:30 +09:30
Zuhayr
3fc9260187
Merge pull request #8954 from GinjaNinja32/diona_speech
...
Fixes dionaea always using the verb "says".
2015-04-23 17:02:20 +09:30
GinjaNinja32
07cc28af8e
Fixes dionaea always using the verb "says".
...
Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea.
Fixes #8952
2015-04-23 08:03:07 +01:00
Chinsky
392cc1b0bb
Merge pull request #8938 from GinjaNinja32/floorpainter
...
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
Chinsky
df21e9fc2e
Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
...
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
Chinsky
71ffa782c4
Merge pull request #8914 from PsiOmegaDelta/BadMove
...
Ensures new players cannot ghost by moving.
2015-04-23 07:34:34 +03:00
Chinsky
6cc8be6d90
Merge pull request #8936 from Dennok/patch-14
...
Automatic CableLayer
2015-04-23 07:34:00 +03:00
Dennok
813109af88
Add span classes
2015-04-22 23:30:46 +03:00
Dennok
b5317f398a
Create floorlayer.dm
2015-04-22 23:16:20 +03:00
Zuhayr
b10a7e9fef
Merge pull request #8924 from volas/striphtml
...
Return strip_html_properly() back
2015-04-23 02:12:38 +09:30
PsiOmega
4ce1ec1f3d
Pipelayer feedback.
...
Adds span use. Updates and adds visible messages as necessary.
Corrects more instances where on was used instead of a_dis.
2015-04-22 16:49:54 +02:00
Yoshax
e68f9cec70
Adjusts fruits and stuff to have more juice and stuff.
2015-04-22 15:05:38 +01:00
PsiOmega
4cc524265b
Change of random virus targets.
...
The random virus event will now only infect mobs on station and which currently have a player that has been active in the last 5 minutes.
Placeholder until a more indepth discussion about what to do about the random event is concluded.
2015-04-22 12:27:28 +02:00
Dennok
dc19c22056
Fix
2015-04-22 11:27:18 +03:00
PsiOmegaDelta
7a27aece0d
Merge pull request #8941 from Baystation12/master
...
Dev
2015-04-22 09:32:56 +02:00
Dennok
a65c3a63bc
Fix
2015-04-22 09:43:15 +03:00
Dennok
3800db491f
get_brake_path() change
...
Replace "max(abs(speed[1]),abs(speed[2]))" with "get_speed()"
I think this is more logically.
2015-04-22 09:27:24 +03:00
Dennok
44dc5c58ce
Relocate rotate()
...
And add var/rotate for some dont rotated ship.
2015-04-22 09:12:24 +03:00
Dennok
204e41a4fc
Add code to CableLayer
2015-04-22 08:42:49 +03:00
GinjaNinja32
bc6daf5b5f
Fixes floor painter white-bot and white-delivery states
...
Fixes #8937
2015-04-22 05:21:03 +01:00
Dennok
ae978d6cea
Create Cable Layer
2015-04-21 21:00:28 +03:00
Dennok
98e6decd23
Remove standatd_icon
2015-04-21 20:22:51 +03:00
PsiOmegaDelta
5da7c877d3
Merge pull request #8930 from Mark9013100/mercsuitfix
...
Fixes the naming of the merc space suits
2015-04-21 19:06:06 +02:00
PsiOmegaDelta
c1558ed518
Merge pull request #8928 from GinjaNinja32/diona
...
Adds diona 'split' command
2015-04-21 19:05:41 +02:00
Chinsky
bcfb746465
Merge pull request #8901 from PsiOmegaDelta/ShakeShake
...
Structure/table shaking.
2015-04-21 20:04:41 +03:00
Kelenius
446efb3809
Fixed attacking blob breaking logs
2015-04-21 19:57:45 +03:00
PsiOmega
eaa8e341f9
Makes it possible to shake structures people are climbing on to make them stop.
2015-04-21 17:45:09 +02:00
Dennok
fdc3dac17e
Forbid delit [
2015-04-21 16:06:38 +03:00
Dennok
bdc9642cfd
Rotete replace.
2015-04-21 15:57:55 +03:00
GinjaNinja32
a440b228c9
Diona 'split' command, plus bugfix
2015-04-21 01:55:43 +01:00
