Commit Graph

14214 Commits

Author SHA1 Message Date
TheDZD
0669c08518 Merge pull request #5497 from Fox-McCloud/animal-attack-fix
Fixes Animal Attack Text
2016-08-19 18:09:00 -04:00
TheDZD
09614a1ce8 Merge pull request #5493 from Fox-McCloud/emote-fix
Slap Emote Fix
2016-08-19 18:03:05 -04:00
Fox-McCloud
1b45831b77 Fixes Animal Attack Text 2016-08-19 01:06:52 -04:00
Fox McCloud
08800863ad Merge pull request #5495 from Crazylemon64/organ_fixes_v2
Fixes a bunch of organ-related bugs
2016-08-18 23:49:52 -04:00
Fox McCloud
66cdbd2446 Merge pull request #5496 from Crazylemon64/pai_tochat_bug
Fixes pAI saving
2016-08-18 23:49:22 -04:00
Crazylemon64
920ef00e23 Fixes pAI saving 2016-08-18 19:36:24 -07:00
Crazylemon64
6ff4f694b7 Remove debug messages 2016-08-18 19:12:48 -07:00
Crazylemon64
6aedd26beb Fixes a bunch of organ-related bugs 2016-08-18 19:08:29 -07:00
Fox-McCloud
0a5f757f89 Slap Emote Fix 2016-08-18 20:54:37 -04:00
Fox McCloud
724683a8cd Merge pull request #5487 from lordpidey/slimebrain_fix
Slimebrains are now properly an internal organ.
2016-08-18 17:42:06 -04:00
Fox McCloud
c97c5c99e0 Merge pull request #5463 from FlattestGuitar/linda
Fluff items for Linda Clark
2016-08-18 17:36:01 -04:00
TheDZD
c31a497a38 Merge pull request #5473 from Ty-Omaha/LITERALLY-GAMEBREAKING
Changes PDA Hotkey Equip Priority
2016-08-18 17:20:28 -04:00
TheDZD
4c76c29a77 Merge pull request #5477 from Fox-McCloud/borg-remove-no-pls
Prevents Removal of Cyborgs
2016-08-18 17:18:20 -04:00
Fox McCloud
6e24e80c14 Merge pull request #5472 from Krausus/ProcessImprovements
Process Deferral and Profiling Improvements
2016-08-18 17:17:27 -04:00
Mike Long
a0cdce830b Slimebrains are now properly an internal organ. 2016-08-18 16:08:55 -04:00
Fox McCloud
b22b457f17 Merge pull request #5385 from GeneralChaos81/MechBay
Refactors Mech Recharger
2016-08-18 01:40:28 -04:00
Fox McCloud
61f0f022e3 Merge pull request #5479 from Crazylemon64/fat_fix
You're Fatter.
2016-08-18 00:26:36 -04:00
Crazylemon64
d3d44529c6 Naked fat people are fat. 2016-08-17 20:48:57 -07:00
Fox-McCloud
6977792c87 Prevents Removal of Cyborgs 2016-08-17 23:45:52 -04:00
Krausus
541076b6b4 Conflict resolution 2016-08-17 22:54:22 -04:00
TheDZD
87bf3a872f Merge pull request #5476 from Fox-McCloud/crutch-refactor
Crutch Refactor
2016-08-17 22:10:51 -04:00
Fox McCloud
6860bf2d19 Merge pull request #5468 from Ar3nn/Supermatter
Supermatter consume now properly spawns robot debris if a synthetic touches it
2016-08-17 21:59:35 -04:00
Fox-McCloud
1f4f4c6cfe Crutch Refactor 2016-08-17 21:45:55 -04:00
Ar3nn
f702a9feae One more refactor 2016-08-17 21:10:49 -04:00
Fox McCloud
0e43840542 Merge pull request #5462 from LittleBigKid2000/drone-floorpainters
Adds floor painters to engineering cyborgs
2016-08-17 20:18:46 -04:00
TheDZD
db3a13a1d1 Merge pull request #5453 from Crazylemon64/ipc_surgery_fix
Makes IPC surgery much more reliable.
2016-08-17 20:15:53 -04:00
Fox McCloud
c21299ddda Merge pull request #5447 from Crazylemon64/serialization_eyes_fix
Improves Serialization
2016-08-17 20:10:24 -04:00
Isaac Erwin
dbf02506ec Removes floor painter from drones 2016-08-17 19:39:02 -04:00
Fox-McCloud
562df95271 Merge remote-tracking branch 'upstream/master' into strips-out-media 2016-08-17 18:18:56 -04:00
Crazylemon64
f3b069a717 Makes the posibrain move correctly by default 2016-08-17 15:11:19 -07:00
Crazylemon64
09cace7eae Axe code, no commenting 2016-08-17 15:03:57 -07:00
Crazylemon64
dbfee98acd I really need to set tabs as default when working with DM 2016-08-17 14:58:02 -07:00
Fox-McCloud
71d862cabd Merge remote-tracking branch 'upstream/master' into strips-out-media 2016-08-17 17:46:26 -04:00
TheDZD
93d3d4ae1a Merge pull request #5455 from Fox-McCloud/mob-vars
Removes Unused Mob Vars
2016-08-17 17:43:35 -04:00
TheDZD
35b03d23e7 Merge pull request #5454 from Fox-McCloud/object-verbs
Removes A Few Object Verbs
2016-08-17 17:42:24 -04:00
TheDZD
723baf341b Merge pull request #5446 from Crazylemon64/alt_click_optimizations
Alt Click Tile viewing improvements
2016-08-17 17:36:09 -04:00
Fox McCloud
0021d1c02d Merge pull request #5441 from Krausus/CtrlClickYoself
Adds Ctrl+Click-Self Shortcut to Stop Pulling
2016-08-17 17:30:30 -04:00
Fox McCloud
f27123e1ba Merge pull request #5429 from tigercat2000/mecha
/tg/ mecha - Part 1
2016-08-17 17:30:00 -04:00
TheDZD
0a8b81ff7a Merge pull request #5412 from FalseIncarnate/wololo
Wololo
2016-08-17 17:26:10 -04:00
Kyep
22857fcab4 Adds Syndicate Infiltration Team (#4816)
* Adds Syndicate Infiltration Team

Goals:
- Provide a way to introduce a group of co-operating traitors, e.g: for
events.
- Provide a way to draw several ghosts into the round at once.
- Provide a way to enable additional objectives (e.g: kidnap) traitors
don't currently have a way to complete.
- Provide an evil counterpart to the Emergency Response Team.

Main:
- Creates a new "Send Infiltration Team" verb under Secrets -> IC for
admins. This verb creates a team of syndicate infiltrators, drawn from
ghosts.
- The infiltrators themselves are prespawned with stealth items
(including 20 TC uplink implants, dust implants, chameleon jumpsuit,
etc).
- The admin who invokes the SIT chooses their mission. It can be
anything.
- This team has their own shuttle, with 3 docking points on the
Cyberiad: arrivals maint, eng maint, and sci maint.
- Their shuttle has blast doors, and a small shuttle brig for abducting
Cyberiad crew.

Misc:
- Creates an 'emag_immune' attribute for doors (and pod doors). Applies
it to SST, SIT and nuke ops main doors. SST application prevents an
exploit. SIT/nukeops application prevents failzerg.

* check_rights, color codes

* Improved Options

- Added PDA painter to SIT spawn room, to prevent SIT members from
metagaming the SIT by identifying them from their PDA color.
- Added food, drinks, and laundry machine/crayons (to recolor gloves) to
the SIT spawn room.
- Added team size prompt for issuing admin, to allow them to send larger
or smaller teams.
- Removed storage implant from the list of things SIT team members spawn
with. In most cases, they will have plenty of TC to buy one if they want
it.
- Fixed action button sprite on dust implant. No longer displays as
blank.
- Added the number of TC each team member gets on spawn as an
admin-configurable option when using the verb. 20-30 is suggested.
- Updated memories ("Notes") given to each SIT member upon creation.
- Fixed a bug with SIT team size which was sometimes causing one less
person to spawn than was intended.

* Minor Improvements

- Made SIT members show up on antaghud, and to each other. Rather like
nuke ops.
- Made SIT members start out with a flashlight in their backpack, so
they can more easily find their way into the station from maint, without
bumbling around in the dark.
- Removed manhack grenade from SIT shuttle, replaced it with a welding
tool. Subtle hint to break the wall into the station.
- Added option for admins to spawn a Syndicate Officer to brief the team
before they go. The officer does not go with the team. They're rather
like ERT Directors briefing ERTs before they are sent out. Optional
fluff.

* Map Area Tweak

* Fixes potential SST exploit with c4-ing mech door

* Tiger

* World's smallest merge/Travis fix

* Renames Officer to Management Consultant

* Removes protected var blocking C4 on poddoors

* Removes emag_immune property for doors
2016-08-17 17:21:51 -04:00
Fox McCloud
2fe3a3470f Merge pull request #5444 from TullyBurnalot/ProxFix
Fixes Ghost Proximity Tripping
2016-08-17 16:18:18 -04:00
Mieszko Jędrzejczak
cb33fdc79e Goshdurn hoodies 2016-08-17 20:05:05 +02:00
Ty-Omaha
489bb390ce PDA GOES TO PDA SLOT WHERE IT BELONGS INSTEAD OF ID
OMG
2016-08-17 12:25:24 -04:00
Krausus
4478855cfd Process deferral and profiling improvements 2016-08-17 02:10:39 -04:00
GeneralChaos81
825670e29c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MechBay
commit.
2016-08-17 14:47:24 +10:00
Ar3nn
45e5e7b837 Come at it from a better angle 2016-08-17 00:30:25 -04:00
Ar3nn
11fea60587 Properly spawns robot debris 2016-08-16 20:56:11 -04:00
Krausus
c97ce4a51f Makes self-pulling a shortcut to stop pulling 2016-08-16 09:50:50 -04:00
TullyBurnalot
a4f3c7e96b Objects can no longer trigger proximity sensors 2016-08-16 14:13:57 +01:00
Mieszko Jędrzejczak
7ebf5ba6c1 Typos, kids. 2016-08-16 10:57:00 +02:00