Markolie
b4a4f29f3f
Vox/Plasmaman spawn/wizard update
2015-09-23 08:14:12 +02:00
Markolie
9adff714b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
...
Conflicts:
code/controllers/configuration.dm
config/example/config.txt
2015-09-23 07:07:17 +02:00
Markolie
73bacbf17f
Preference option for instruments/sanitize tempo
2015-09-23 07:00:01 +02:00
Markolie
7ab75a3b9a
Missed prefix
2015-09-23 06:25:52 +02:00
Markolie
bbaa60c8ce
Fixes
2015-09-23 06:22:00 +02:00
Markolie
bec9fca533
SQL update
2015-09-23 06:13:42 +02:00
Markolie
d10b68363f
IPC posibrain name fix
2015-09-23 05:15:26 +02:00
Markolie
2b7fda8a47
SQL based memos
2015-09-23 05:08:28 +02:00
Mark van Alphen
a9320fa701
Merge pull request #2140 from tigercat2000/whops
...
Fix COMIC-stuttering conflict
2015-09-23 04:43:29 +02:00
Tigercat2000
21e4750ade
Fix COMIC-stuttering conflict
2015-09-22 19:37:57 -07:00
Markolie
4b2dcf2394
Nuke the privacy poll
2015-09-23 04:31:28 +02:00
Fox-McCloud
dea1d5a78d
Merge pull request #2136 from Markolie/pet
...
Fixes
2015-09-22 21:19:11 -04:00
Markolie
039a79ff26
Research consoles auto sync fix
2015-09-23 02:52:07 +02:00
Markolie
551d4e8988
Admin jump window fix
2015-09-23 02:51:59 +02:00
TheDZD
67d84e0bbf
Merge pull request #2118 from Markolie/pet
...
Fixes, saber SMG update
2015-09-22 19:06:37 -04:00
TheDZD
cbbd31d445
Merge pull request #2128 from Fox-McCloud/rejuv-fixup
...
Rejuvinate Fixup
2015-09-22 19:05:51 -04:00
Fox-McCloud
d1ce77b30f
cut the list
2015-09-22 12:17:11 -04:00
Mark van Alphen
fea9ce1e78
Merge pull request #2116 from Fox-McCloud/borg-virus
...
Borg Transformation Virus Symptom
2015-09-22 16:52:18 +02:00
Mark van Alphen
ca05c41134
Merge pull request #2117 from Fox-McCloud/surgery-cleanup
...
Cleans Up Surgery Files
2015-09-22 16:51:11 +02:00
Mark van Alphen
6d46c06297
Merge pull request #2113 from tigercat2000/whisper_autohiss
...
Whisper Refactor
2015-09-22 16:48:42 +02:00
Fox-McCloud
784dd66e46
Rejuvinate Fixup
2015-09-22 02:42:39 -04:00
Tigercat2000
a51fcb20c2
Fix posibrains being unable to speak binary
2015-09-21 22:19:27 -07:00
Fox-McCloud
562305902e
fix for symptom
2015-09-21 21:10:20 -04:00
Markolie
727e1271b0
Missing variable
2015-09-22 01:51:28 +02:00
Markolie
dc70ec8e8b
Accounts database fix
2015-09-22 01:38:41 +02:00
Markolie
3c7413dc65
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-09-22 00:17:30 +02:00
Tigercat2000
c43db838f2
fix me() verb
2015-09-21 15:15:05 -07:00
Markolie
3caac1e1e2
Check for 100+ armor
2015-09-21 22:58:42 +02:00
Markolie
f7234374b5
Update armour penetration checks
2015-09-21 22:54:26 +02:00
Markolie
ea305d3ffa
Saber SMG update, add armour piercing variable
2015-09-21 22:50:07 +02:00
Markolie
cc641cb477
Photo image fix
2015-09-21 22:49:49 +02:00
Fox-McCloud
128ad8225b
Clans Up Surgery Files
2015-09-21 07:17:23 -04:00
Fox-McCloud
206ddda717
Borg Transformation Virus Symptom
2015-09-21 04:25:26 -04:00
Fox-McCloud
810784c8ac
qdel() dem powernets
2015-09-21 01:17:12 -04:00
Fox-McCloud
bd3696523b
GC a few Datums
2015-09-20 22:40:13 -04:00
Tigercat2000
7db714f2ef
Whisper overhaul
...
This commit overhauls whisper to work at a /mob/living level
This means that all mobs will now be able to whisper properly, not just
humans. Exception; Drones will just say() what they attempt to whisper.
Also fixes autohiss not working for whispering.
2015-09-20 19:23:30 -07:00
Fox-McCloud
e371c9662a
Merge pull request #2106 from Markolie/pipenet
...
Pipenet revamp
2015-09-20 20:47:02 -04:00
Markolie
a39c3ec9ba
gcDestroyed fixes
2015-09-21 02:33:53 +02:00
Markolie
c5c64413a1
Pipenet overhaul
2015-09-21 02:11:54 +02:00
Mark van Alphen
3510e6c863
Merge pull request #2104 from Fox-McCloud/spray-bottle-nerf
...
Spray Bottle Nerf
2015-09-21 02:10:43 +02:00
Mark van Alphen
44fc7e80e2
Merge pull request #2103 from Fox-McCloud/reagent-balance
...
Reagent Balance Tweaks
2015-09-21 02:10:36 +02:00
Mark van Alphen
467b51f3d2
Merge pull request #2102 from Fox-McCloud/reagent-skin-rework
...
Reagent Skin Penetration Rework
2015-09-21 02:10:26 +02:00
Mark van Alphen
7a288c52f8
Merge pull request #2098 from Fox-McCloud/chemical-patch-balance
...
Chemistry: Patch Balance
2015-09-20 04:46:23 +02:00
Mark van Alphen
78556eec24
Merge pull request #2105 from Fox-McCloud/brain-pain
...
Tweaks Brain Damage Messages
2015-09-20 04:45:33 +02:00
Fox-McCloud
fb31916f43
Tweaks Brain Damage Messages
2015-09-19 19:50:48 -04:00
Fox-McCloud
e2a28b981a
Merge pull request #2100 from tigercat2000/broken_say
...
A bunch of saycode fixes
2015-09-19 18:55:54 -04:00
Tigercat2000
d5e5690d11
Whoops, forgot nymph sounds
2015-09-19 10:14:26 -07:00
Tigercat2000
7e522ed730
More emote fixes, universal silicon beeppingbuzz
...
This commit does the following:
- Fixes more oddities and standardizes more emote procs
- All silicons now share beep, ping, and buzz
2015-09-19 10:11:42 -07:00
Tigercat2000
bab04c669e
Emote fixes, most of it's still insane
2015-09-19 08:47:53 -07:00
Fox-McCloud
be4607d70d
Spray Bottle Nerf
2015-09-19 09:09:01 -04:00
Markolie