Markolie
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Fox McCloud
f000c0c225
Merge pull request #2238 from Markolie/emotes
...
Add cooldown to chirp emote, dsay fix
2015-09-29 22:37:31 -04:00
Mark van Alphen
f10fd6e1ee
Merge pull request #2212 from Spacemanspark/master
...
Makes *deathgasp less snowflakey
2015-09-30 04:30:53 +02:00
Markolie
1a7c565482
Fix
2015-09-30 03:38:44 +02:00
Markolie
9277a2f55e
Dsay fix
2015-09-30 03:35:30 +02:00
Markolie
8d99c8c689
Add cooldown to chirp emote
2015-09-30 03:04:15 +02:00
TheDZD
d84868d43f
Merge pull request #2229 from Markolie/hotkey
...
Admin PM fix
2015-09-29 20:25:56 -04:00
Fox McCloud
15c9873cdf
Merge pull request #2224 from Markolie/shitcode
...
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
f7c2685122
Admin PM fix
2015-09-30 00:21:55 +02:00
Markolie
8b2e62fc10
Strange reagent fix, tod --> timeofdeath
2015-09-29 22:03:04 +02:00
Mark van Alphen
bee80d49cb
Merge pull request #2211 from Crazylemon64/stickier_beakers
...
Stickier cyborg beakers
2015-09-29 21:55:48 +02:00
Crazylemon
734e0842e2
Fixed a few more reversed add_logs
...
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Crazylemon
9678fe09ec
Replaced location setting with forceMove()
...
I'm restricting this only to the machine's I'm affecting with this fix.
Refactoring the rest of the code to use it would be for a different
thing.
2015-09-29 11:09:38 -07:00
Fox-McCloud
18a340085c
Merge pull request #2219 from tigercat2000/tuhtuh
...
Fix exploit, refactor access to body color,
2015-09-29 12:21:25 -04:00
Tigercat2000
3c80bd7eb1
Fix exploit, refactor access to body color,
...
let IPC's actually change color as non-admins
2015-09-29 08:52:20 -07:00
Fox-McCloud
7586390436
Merge pull request #2146 from TheDZD/vision
...
Shadowling, Changeling, and Vision Fixes/Changes
2015-09-29 11:44:06 -04:00
TheDZD
6705006ee7
Merge pull request #2213 from Fox-McCloud/destroy-fixes
...
Fixes a few Destroys
2015-09-28 19:28:29 -04:00
DZD
b990b6c71b
Merge remote-tracking branch 'upstream/master' into vision
2015-09-28 19:03:14 -04:00
Spacemanspark
34b1a3a52f
Adds the death message to monkeys again. Oops.
2015-09-28 17:40:24 -05:00
Fox-McCloud
be672419ca
Fixes a few Destroys
2015-09-28 18:15:39 -04:00
Spacemanspark
197f0b7219
makes *deathgasp less snowflakey
2015-09-28 16:58:28 -05:00
Spacemanspark
624b7cbc71
Gives IPC's a unique death message in a less snowflakey manner.
2015-09-28 16:57:16 -05:00
Spacemanspark
a02d843153
De-snowflakes *deathgasp
2015-09-28 16:55:04 -05:00
Crazylemon
a1636b3b24
NODROP is now more respected
...
A few machines, especially in medical, didn't respect NODROP. Hopefully
with these changes, medical cyborgs should no longer get their beaker
stuck in some sort of bizarre multipositional limbo.
2015-09-28 14:48:06 -07:00
Fox-McCloud
3ec20a2313
Merge pull request #2208 from Markolie/fixes3
...
Fixes
2015-09-28 16:32:11 -04:00
Tigercat2000
ec2b31e435
Nuke wheelchair snowflake shit, fix the delay
2015-09-28 12:59:44 -07:00
Markolie
8e37513502
Make sure all departments can still sync with R&D
2015-09-28 20:39:30 +02:00
Markolie
2c7d6f1a1b
Law manager now only requires the host to be conscious
2015-09-28 18:25:50 +02:00
Fox-McCloud
933ffcd7d0
Merge pull request #2197 from Markolie/stickyban
...
Add in-game stickyban interface
2015-09-28 03:20:37 -04:00
Fox-McCloud
6a2c7a82ff
Merge pull request #2194 from tigercat2000/frunkenstien
...
Frankenstein
2015-09-28 02:58:44 -04:00
Fox-McCloud
7546716cff
Merge pull request #2193 from Markolie/spacecube
...
Removes the space cube, implements the round-randomized torus space map
2015-09-28 00:04:57 -04:00
Markolie
4bcb5d0eb2
Add sorting to stickyban list
2015-09-28 05:58:00 +02:00
Markolie
f69beaeb00
Drone fix, runtime fixes
2015-09-28 03:34:33 +02:00
Markolie
f7fe8c8c6f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-09-28 03:05:04 +02:00
Mark van Alphen
48a3d1ab9a
Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors
...
Janicart and Janitor Update
2015-09-28 03:02:04 +02:00
Markolie
6b7d8914d9
Admin messaging for proc calls
2015-09-28 01:44:18 +02:00
Markolie
273bcb07e5
Add vial box to virology, in view() update
2015-09-28 01:18:04 +02:00
Markolie
1952d15699
Space fix
2015-09-28 00:44:07 +02:00
Mark van Alphen
d3ff9f50ed
Merge pull request #2184 from Spacemanspark/master
...
Gives a special *deathgasp text to IPC's.
2015-09-28 00:27:19 +02:00
Markolie
bd65300965
Formatting update, make sure that reload admins remove proccall verbs
2015-09-28 00:22:35 +02:00
Markolie
44763a869a
Stickyban clean-up, add admin bans
2015-09-27 23:58:10 +02:00
Markolie
b914544a87
Fixes
2015-09-27 22:50:09 +02:00
Markolie
6f2a753d89
Send questions to admins and mods
2015-09-27 21:38:08 +02:00
DZD
0ceaf664af
Fix merge conflicts
2015-09-27 11:24:51 -04:00
Fox-McCloud
569758f4cb
bluespace trashbag
2015-09-27 06:46:50 -04:00
Markolie
84f1c2ab8f
Re-add ban appeal message, memo check
2015-09-27 09:08:10 +02:00
Markolie
1b14817889
Add in-game stickyban interface
2015-09-27 09:02:58 +02:00
Markolie
efbf5f50f0
Make sure sprites update on login
2015-09-27 08:38:21 +02:00
Tigercat2000
a9af8b1532
Frankenstein
...
This commit does the following
- Organs are no longer reliant on the species and DNA of their attached
owner. Whoever made the organs (ex a spawned mob) transfers their
species and DNA to the organ, and it uses that for calculations.
- You may now attach organs cross-species; Yes, this means sticking
skrell heads onto humans to make tentacle monsters. Or something.
- IPC's may now choose their frame color.
- I did say elsewhere this was not feasible; However, after taking a few
hours to learn the systems behind all of it, I managed to hack
something together. It's snowflakey, but fuck it, it doesn't need to
be not-snowflakey.
2015-09-26 23:24:52 -07:00
Markolie
f63abafd2b
Make robot components start powered
2015-09-27 08:21:07 +02:00
