Commit Graph

10663 Commits

Author SHA1 Message Date
veganzombeh
ce768eae26 pAIs can no longer force people on help intent to pick them up.
Apparently, pAIs could force people to pick them up by dragging themselves onto a person on help intent. This adds an alert which makes it a bit more clear what's happening, and requires the person to agree, similar to the give verb.
2015-09-12 16:14:21 +01:00
Markolie
d5a3fb57ea Add cooldown to pAI card/drone reactivations 2015-09-11 06:51:14 +02:00
Markolie
caf5603822 Properly remove shadowling/cult status from robots 2015-09-11 06:46:07 +02:00
Markolie
7de2086059 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 2015-09-11 06:14:32 +02:00
Markolie
548bacfc7f Properly add Syndicate stamp to Syndicate faxes 2015-09-11 05:50:53 +02:00
Fox-McCloud
c24953cc9a Merge pull request #1960 from KasparoVy/master
Adds Vox Sprites for all Remaining Clothing/Under/ + Ghost Uniform
2015-09-10 01:13:43 -04:00
KasparoVy
962234f7b4 Fixes Really Black Jumpsuit
Before, on wearing, it'd show the exact same sprite as the 'black
suit'-- while this was clearly unintended. Now shows the correct sprite
(for humans as well!)
2015-09-09 23:54:46 -04:00
Fox-McCloud
2e7dcf89f2 Fixes RD Console Var Warning 2015-09-09 23:35:07 -04:00
Mark van Alphen
84b42c5491 Merge pull request #1986 from Fox-McCloud/nuke-and-tator
Nuke Ops and Traitor Update+Balance
2015-09-10 02:24:32 +02:00
Mark van Alphen
cceffcbbf9 Merge pull request #1976 from Fox-McCloud/xeno-tweak
Respawn as NPC Tweak: Xeno Removal
2015-09-10 01:17:20 +02:00
Mark van Alphen
450b89eb6e Merge pull request #1981 from Fox-McCloud/rnd-cargo
R&D Update and Fix & Cargo Tweaks
2015-09-10 01:15:26 +02:00
Mark van Alphen
69139c1bef Merge pull request #1993 from Fox-McCloud/rad-laser-fix
Rad Laser Fix
2015-09-10 01:14:38 +02:00
Fox-McCloud
385dc0d47b Space Cleaner Lighting Fix 2015-09-09 18:52:27 -04:00
Fox-McCloud
d70c166109 Rad Laser Fix 2015-09-09 17:00:53 -04:00
Fox-McCloud
b2387403a7 Merge pull request #1977 from Regen1/Cinemaverb
Adds cinematic verb
2015-09-09 15:47:06 -04:00
Regen
5a87bfd41e Move verb to debug 2015-09-09 16:52:35 +02:00
Fox-McCloud
1d7db62047 Merge pull request #1965 from FalseIncarnate/master
Unknown Language Fix, Shrimp Recipe Tweak
2015-09-09 03:08:45 -04:00
FalseIncarnate
76817f8c59 Language and IPC Random Name Fix
Fixes an incorrect language datum path that was the true culprit for the
"an unknown language" option.
- Fixing this path also has fixed IPC random names being random strings
of 0's, 1's, and the occasional 2.

Re-consolidated the vars for the /datum/language define to be in a
single code block

Adds a new proc for clients that lists all language names, their path,
and whether they are restricted.
- Can only be called via proc-call
- For debugging purposes only, please do not use on live server as it
will spam chat due to sending the messages to world.
2015-09-09 02:43:40 -04:00
KasparoVy
535805e4b4 Cleaning out all the species_fit and sprite_sheets 3 2015-09-08 22:10:33 -04:00
KasparoVy
5a9b733173 Cleaning out all the species_fit and sprite_sheets 2 2015-09-08 22:09:50 -04:00
KasparoVy
24240217c1 Cleaning out all the species_fit and sprite_sheets
Thanks @Fox_McCloud, I missed those
2015-09-08 22:09:24 -04:00
KasparoVy
e2a0445ce0 Adds Vox Sprite for Everything in clothing\under + Some Fixes
Exactly as the title says, however the fixes include sorting out the old
ripped Vox uniforms and moving all the species_fit and sprite_sheets.

Crapload of sprites being added here.
2015-09-08 21:54:34 -04:00
Tigercat2000
87026b48e1 Fixes wrong a_intent, blame 8fae0f02 2015-09-08 18:13:23 -07:00
Fox-McCloud
5551b7aa56 ewwwww 2015-09-08 20:05:27 -04:00
Fox-McCloud
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Tigercat2000
ee32c0a35a Merge branch 'master' into intent_define
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2015-09-08 04:43:13 -07:00
Fox-McCloud
28bcd7e78b R&D Update and Fix & Cargo Tweaks 2015-09-07 20:03:06 -04:00
Tigercat2000
f7f19eac59 Merge branch 'master' into reageaaaannntttttts
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

+ apply cleaner patch manually
2015-09-07 16:02:17 -07:00
Fox-McCloud
8ced3a447f Merge pull request #1979 from tigercat2000/sockspatch
fix sock sql
2015-09-07 17:28:23 -04:00
TheDZD
8cb3ffaf58 Merge pull request #1956 from Fox-McCloud/perdy-colors
Space Cleaner Feature: Color Removal
2015-09-07 17:24:57 -04:00
TheDZD
0fdfae99ba Merge pull request #1966 from Fox-McCloud/health-assembly
Health Assembly
2015-09-07 17:24:52 -04:00
TheDZD
ec3113f44b Merge pull request #1964 from Fox-McCloud/rnd-update
R&D Update: Implants and Autolathes
2015-09-07 17:20:44 -04:00
Tigercat2000
e1da42764c fix sock sql 2015-09-07 14:17:15 -07:00
Fox-McCloud
a8f41c69fb sprite-revert 2015-09-07 16:55:40 -04:00
Mark van Alphen
6c1208e18f Merge pull request #1819 from Aurorablade/GoOnYourFeet
[Sprite] [TG Port] Things that go on your feet
2015-09-07 22:31:21 +02:00
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
Fox-McCloud
fc82cc6976 typo 2015-09-07 13:52:37 -04:00
Regen
009909650c Adds cinematic verb
This will add the cinematic verb to the Event panel, will work like a
normal nuke / AI override, meaning it will kill everyone (ending the
round)
2015-09-07 12:11:45 +02:00
Fox-McCloud
de7eb610a6 Respawn as NPC Tweak: Xeno Removal 2015-09-07 01:15:37 -04:00
Tigercat2000
e30ae7dbc3 Whoops, tabbing. 2015-09-06 21:04:51 -07:00
Tigercat2000
156bdb64c2 Split giant chemistry files into oldchem folder
This commit does the following:
 - Removes relative pathing from:
  - Chemistry-Holder.dm
  - grenade_launcher.dm
  - reagent_dispenser.dm
 - Splits Chemistry-Reagents.dm into oldchem/reagents/
 - Splits Chemistry-Recipies.dm into oldchem/chemical_reaction/

Another couple of huge relative-pathed files resolved.
2015-09-06 20:41:37 -07:00
Fox-McCloud
e97e6d1cc9 Merge pull request #1973 from Markolie/intercom
Fix invincible spiderbots and cryo bags
2015-09-06 23:35:49 -04:00
Markolie
8abdc80987 Fix invincible spiderbots and cryo bags 2015-09-07 04:49:55 +02:00
Fox-McCloud
e20fedaec1 Merge pull request #1957 from tigercat2000/tg_xeno_tweaks
Misc. -tg- xeno tweaks
2015-09-06 16:48:15 -04:00
Fox-McCloud
3250621552 Health Assembly 2015-09-06 02:19:44 -04:00
FalseIncarnate
81deb3f062 Unknown Language Fix, Shrimp Recipe Tweak
Removes "an unknown language" from selectable options in character
creation
- Fixes #1940

Tweaks the recipe for Cooked Shrimp to be more in-line with similar
recipes
- Previously required 1 unit of water, now requires 5 units of water
2015-09-06 00:01:27 -04:00
Fox-McCloud
2214a8b455 R&D Update: Implants and Autolathes 2015-09-05 23:57:22 -04:00
TheDZD
fe2a3ef960 Merge pull request #1954 from Fox-McCloud/material-datums
Material datums, Recycler Refactor, and Additional Item Materials
2015-09-05 19:36:15 -04:00
KasparoVy
80ac7a3769 Adds Vox sprites for remaining medsci clothing items, reformats code
Adds Vox sprites for the Mortician's black scrubs (which was missing for
whatever reason), the Psychiatrist's regular uniform + turtleneck, and
all the 'new' suffixed uniforms (just in case).
2015-09-05 18:27:39 -04:00
KasparoVy
e5a5040363 Adds Vox Mechanic sprite, reformats code
Adds a Vox Mechanic sprite and reformats the code in
code\modules\clothing\under\jobs\engineering.dm as now every obj has a
Vox sprite
2015-09-05 18:19:29 -04:00