Commit Graph

20696 Commits

Author SHA1 Message Date
D3athrow
a42bcc700b Fixes #6644 2015-11-19 17:21:47 -06:00
D3athrow
0d5b4b692f Fix #6662 2015-11-19 17:00:15 -06:00
clusterfack
0539b8f07c Merge pull request #6655 from dylanstrategie/Xeno-Griff
Xenomorphs can now slash atmos canisters
2015-11-19 09:50:54 -06:00
clusterfack
b576f68a56 Merge pull request #6661 from dylanstrategie/Xenomalleum
Add attack delayers to resin doors and alien nests
2015-11-19 09:50:12 -06:00
dylanstrategie
081107fb63 Add attack delayers to resin doors and alien nests 2015-11-19 16:18:17 +01:00
dylanstrategie
fbfd1b3dd5 Xenomorphs can now slash atmos canisters 2015-11-19 02:57:02 +01:00
Rob Nelson
3b6ff135da Merge pull request #6648 from Faptastic/EMPCamfix
Fixed #6638
2015-11-18 17:04:53 -08:00
Rob Nelson
0b8380f142 Merge pull request #6650 from eswordthecat/playsound
move get_turf line above, remove isarea check because get_turf return…
2015-11-18 17:04:26 -08:00
Rob Nelson
e1a7aed83f Merge pull request #6653 from dylanstrategie/CO2-Is-Not-Air
Properly fix 'Air' Miners
2015-11-18 17:04:07 -08:00
dylanstrategie
669b647d40 Properly fix 'Air' Miners 2015-11-19 01:53:08 +01:00
dylanstrategie
eaa0a9a669 Fix Sleeper Construction Typo 2015-11-19 01:33:21 +01:00
Faptastic
f639a4bacb Fixed #6638 2015-11-18 20:31:46 +00:00
eswordthecat
8289c396fa move get_turf line above, remove isarea check because get_turf returns null when area, not an atom and nulled arg. Also this prevents unnecessary get_turf(*) calls at playsound calls. 2015-11-19 02:17:58 +08:00
Rob Nelson
640050a14b Merge pull request #6645 from DeityLink/fixbiruz
Fixing Eye Lasers
2015-11-18 02:11:32 -08:00
Rob Nelson
109ad001c6 Merge pull request #6646 from DeityLink/dionaspike
Kitchen spike diona nymph sprite
2015-11-18 02:11:01 -08:00
DeityLink
8484b77bde dionaspike 2015-11-18 08:06:48 +01:00
DeityLink
144f90402f biruzbennar fix 2015-11-18 07:40:32 +01:00
D3athrow
8d979c39ee Gets rid of the double name for anti-toxin
Not really a bug, but it's the only reagent whatsoever that does it.
The description's the same, so it wouldn't be a problem for anyone not familiar with the name. (reverted from commit cf35449852)
This was a stupid, unneeded change.
2015-11-18 00:03:00 -06:00
D3athrow
9072931a52 guess I missed this. 2015-11-17 23:57:54 -06:00
Rob Nelson
2c376492ab Merge pull request #6623 from unid15/master
Bugfixes (runtimes, objectives on z-level 2)
2015-11-17 14:40:13 -08:00
Rob Nelson
b0dacc8361 Merge pull request #6633 from Zth--/fixes
Fixes syndies eswords
2015-11-17 13:39:11 -08:00
Rob Nelson
fb8a2eb1ed Merge pull request #6635 from unid15/whatthefuck
Fixes service borgs
2015-11-17 13:38:51 -08:00
Rob Nelson
00633ce79d Merge pull request #6636 from unid15/buga
Better errors for playsound
2015-11-17 13:38:21 -08:00
eswordthecat
7f3417500c Fix runtime error: Cannot execute null.defense() 2015-11-18 05:27:31 +08:00
unid15
c68d8ec5fe makes some items abstract, better errors for playsound 2015-11-17 20:25:40 +01:00
unid15
756db6921b fixes reagents (deity why) 2015-11-17 20:06:05 +01:00
Zth--
5f98dd51da fixes syndie eguns 2015-11-17 12:01:16 -03:00
Rob Nelson
a18c89ba83 Merge pull request #6627 from Zth--/fixes
Fixes #4995
2015-11-16 23:51:33 -08:00
DeityLink
ef0d925338 damn you remie richards 2015-11-17 08:45:22 +01:00
Zth--
4247724916 fixes disposals breaking tiles 2015-11-16 22:31:32 -03:00
Rob Nelson
a6475b8033 Merge pull request #6599 from eswordthecat/list-targets
ohearers instead of subtracting src
2015-11-16 17:21:38 -08:00
Rob Nelson
245ca44e8a Merge pull request #6602 from Arthurdentist/suitlord
fixes #6598
2015-11-16 17:20:40 -08:00
Rob Nelson
05478ada33 Merge pull request #6603 from DeityLink/emprove
Fixing and improving stuff
2015-11-16 17:20:25 -08:00
Rob Nelson
38def483a2 Merge pull request #6604 from eswordthecat/locate-no
remove two locate call and instead just use itself as an argument.
2015-11-16 17:19:00 -08:00
Rob Nelson
2c69daf903 Merge pull request #6605 from eswordthecat/trange-scanner
change range to trange, because it only wants the turfs not all objects.
2015-11-16 17:18:32 -08:00
Rob Nelson
768d8f8438 Merge pull request #6607 from 9600bauds/don'tbwoinkmebro
Fixes #6606
2015-11-16 17:17:45 -08:00
Rob Nelson
e4bdc6f2df Merge pull request #6609 from eswordthecat/runtime-rc-access
Fix runtime error: Cannot read null.access
2015-11-16 17:17:06 -08:00
Rob Nelson
f87888c8e4 Merge pull request #6610 from eswordthecat/runtime-wormhole-z
Fix runtime error: Cannot read null.z
2015-11-16 17:16:59 -08:00
Rob Nelson
bae763c1ed Merge pull request #6614 from eswordthecat/runtime-alarm-shorted
Fix Cannot read null.shorted at alarm.dm:68
2015-11-16 17:16:49 -08:00
Rob Nelson
0f70c92f3e Merge pull request #6615 from eswordthecat/runtime-alarm-return_air
Fix runtime error: Cannot execute null.return air().
2015-11-16 17:16:40 -08:00
Rob Nelson
bd4d704f49 Merge pull request #6619 from ShiggyPiggy/patch-1
[Autism] Anti-toxin (Dylovene) renamed to Dylovene
2015-11-16 17:16:19 -08:00
Rob Nelson
cb5b11f8ac Merge pull request #6620 from 9600bauds/hmmidosowonderhowmanyalienshaveslashedacamerawithoutknowingitdidntwork
Fixes cameras not deactivating when being deactivated, fixes camera alarms not going away, makes cameras even easier to upgrade
2015-11-16 17:15:33 -08:00
unid15
fb72924ffa people on centcom zlevel are no longer targeted by soem events 2015-11-16 19:36:57 +01:00
unid15
27497b0787 fixes infinite hallucinations 2015-11-16 19:04:48 +01:00
unid15
43b539ab0c fixes three bugs 2015-11-16 18:48:11 +01:00
9600bauds
61af3a4856 Fixes cameras not deactivating when being deactivated, fixes camera alarms not going away. 2015-11-15 23:39:29 -03:00
ShiggyPiggy
cf35449852 Gets rid of the double name for anti-toxin
Not really a bug, but it's the only reagent whatsoever that does it.
The description's the same, so it wouldn't be a problem for anyone not familiar with the name.
2015-11-16 05:41:58 +06:00
9600bauds
6d8062ebc7 Fixes DNA scanner bwoinking ghosts that can't rejoin their body, fixes defib reviving corpses from ghosts that can't rejoin their body. 2015-11-15 18:20:42 -03:00
eswordthecat
53c0220c2b Fix runtime error: Cannot execute null.return air(). 2015-11-15 22:18:58 +08:00
eswordthecat
c8a35db7c0 Fix runtime error: Cannot read null.access 2015-11-15 22:15:32 +08:00