Commit Graph

22674 Commits

Author SHA1 Message Date
Neerti
df2f02c5af Merge pull request #632 from Mark9013100/12/20/2015secpistol
Replaces the standard .45 pistol with the Detective's.
2015-12-20 16:02:42 -05:00
Datraen
0122262140 Asteroid now processes air properly. 2015-12-20 15:51:34 -05:00
Mark9013100
a4b891f5ef Replaces the standard .45 pistol with the Detective's. 2015-12-20 15:36:26 -05:00
Datraen
51bec27882 Merge pull request #628 from Datraen/SparksQdelFix
Stops sparks from trying to qdel twice.
2015-12-20 15:17:17 -05:00
Neerti
6b2bbf3d63 Merge pull request #630 from Datraen/ParalyzeVerb
Adds a paralyze button for easy administration.
2015-12-20 14:43:51 -05:00
Datraen
c778ff59b2 Returns the deincrementation of spark count on the tile. Removal time is in line with the deincrementation time. 2015-12-20 14:41:55 -05:00
Datraen
f9c6c0549e Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 2015-12-20 14:38:10 -05:00
Datraen
d2eba4610f Adds a paralyze button for easy administration. 2015-12-20 14:20:09 -05:00
Zuhayr
6faeea5462 Fixes for the asteroid turf post-changes. 2015-12-21 04:59:32 +10:30
Datraen
84a55c2f87 Stops sparks from trying to qdel twice. 2015-12-20 13:16:45 -05:00
PsiOmegaDelta
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
woodratt
8cd20b03f3 1.3.6 - Bug Fixes and Spurs
- Replaced 971 left facing windows with ones without super health.
- Adjusted lights in both the medical and engineering rest rooms.
- Adjusted several intercoms across the station, including the AI core ones.
- Centcomm beach area sounds removed.
- Adjusted maintenance between bridge and kitchen.
- Keycard Identification thing added to HoP office.
- Plastic flaps added to cargo deliveries office.
- Fixed Emitter in Engineering outpost.
- Fixed voided tile on t-comms, fixed the dark tiles.
- Added a mighty fine cowboy hat.
2015-12-19 21:41:35 -08:00
ccomp5950
ce3587d867 Hallucinations no longer burn on the SuperMatter 2015-12-19 21:33:02 -05:00
Zuhayr
593759b4e3 Merge pull request #11713 from PsiOmegaDelta/151219-AIQdels
AI qdel() improvements.
2015-12-20 11:15:10 +10:30
PsiOmegaDelta
378f62b81e AI qdel() improvements.
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710.
2015-12-19 11:45:24 +01:00
SinTwo
e63e9b0b2a The great childrening. 2015-12-19 00:54:29 -05:00
SinTwo
b03a4d68be Sin's Sprite Attack 2015-12-18 23:35:29 -05:00
sabess
00323ad7ad The Final Fix probably maybe hopefully 2015-12-19 14:11:26 +11:00
Chinsky
4a0d121f25 Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster
No verbose cantouch check when not climbable
2015-12-19 03:13:45 +03:00
SinTwo
c43289b7fc Adds more clothes. (againagainagainagain) 2015-12-18 18:19:17 -05:00
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows
- Fixes #11465
2015-12-18 20:12:46 +13:00
sabess
a9a0573237 Removed brass knuckles from steel sheets, added to hacked autolathe. 2015-12-18 13:16:09 +11:00
Neerti
6bbe3a4d1e Merge pull request #614 from EmperorJon/18_Dec._Fix_asteroid_merc_shuttle
Heist and Merc ships no longer leave sand!
2015-12-17 19:41:55 -05:00
Jon
c2773ee725 Heist and Merc ships no longer leave sand! Whoopsy. 2015-12-18 00:29:13 +00:00
Zuhayr
4de9479b47 Fixes colour issues. 2015-12-18 10:52:56 +10:30
EmperorJon
94eb6c4e30 Merge pull request #597 from Hubblenaut/blob
Prevents blob from growing over asteroid walls
2015-12-18 00:09:07 +00:00
Hubblenaut
56d8975a19 Tweaks Filtering and Toxic Gases 2015-12-17 17:50:30 +01:00
Hubblenaut
dc2ad43dc5 No verbose cantouch check when not climbable 2015-12-17 17:44:04 +01:00
SinTwo
14cc3c9574 Merge pull request #607 from PolarisSS13/12/16/15_Sin2_Clothes_Update
Jackets
2015-12-16 17:54:27 -05:00
SinTwo
41dcee7d0e Jackets 2015-12-16 17:36:48 -05:00
Neerti
3d8f878250 Merge pull request #602 from Hubblenaut/master
Colors on-mob sprites
2015-12-16 17:12:20 -05:00
EmperorJon
bafbba0695 Merge pull request #604 from PolarisSS13/12/16/15_Sin2_Clothes_Update
Adds Clothes, Hair, clothes fixes, and hair fixes.
2015-12-16 21:48:53 +00:00
SinTwo
a1a286cccb Adds Clothes, Hair, clothes fixes, and hair fixes. 2015-12-16 16:19:57 -05:00
Neerti
3cf4ffcd2b Fixes ghost-callers being unable to hear linked communicators.
Fixes exonet node research pattern being wrong.
Makes communicators showing up on the ghost communicator list have stricter checks for being able to receive a request.
2015-12-16 16:01:52 -05:00
Hubblenaut
8be57cd730 Prevents blob from growing over asteroid walls 2015-12-16 21:01:41 +01:00
Hubblenaut
ffc6e7dcb7 Colors on-mob sprites 2015-12-16 20:42:49 +01:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous.
#11370
2015-12-16 20:07:35 +03:00
Spamcat
f2ac9a023b pAIs no longer see custom emotes twice.
fuck i spent way too much time on a single line fix
2015-12-16 19:36:14 +03:00
Spamcat
a515f0469a Wrenched opwn welding tanks now explode when exposed to fire.
#11537
2015-12-16 17:59:05 +03:00
sabess
970cecc80d Fixed some stuff. 2015-12-17 00:23:23 +11:00
PsiOmegaDelta
f62f24e1ac Removes Stat() sleep.
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.

Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
PsiOmegaDelta
df6972dbbb Merge pull request #11695 from Baystation12/master
Dev-freeze
2015-12-16 10:51:05 +01:00
Neerti
760097b3b7 Merge pull request #519 from Zuhayr/cavegen
Cave generator enhancements.
2015-12-16 01:23:01 -05:00
Zuhayr
8ebb7c5b5f Rewriting the mining turfs to reduce worldstart lag. 2015-12-16 16:16:41 +10:30
Zuhayr
f2cc74d588 # This is a combination of 2 commits.
# The first commit's message is:

Rewriting the mining turfs to reduce worldstart lag.

# This is the 2nd commit message:

Map cleanup.
2015-12-16 15:26:38 +10:30
Zuhayr
1a5978f7f1 Fixes some overlay issues with aiming. 2015-12-16 15:14:44 +10:30
Neerti
33f85b8b88 Makes radiation medication not actually irradiate you worse. 2015-12-15 22:25:49 -05:00