cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,927 Commits 10 Branches 0 Tags
b0eebb2edb69c2513c20b792c66cf46582ce6b93
Commit Graph

764 Commits

Author SHA1 Message Date
SkyMarshal
b0eebb2edb Reverted some layer adjustments I did that seem to have broken things, bugfixes for operating tables, choking people, and CPR, giving. Also added sterile mask box sprite, and tossed the singularity crap into a spawn(0) to try and reduce lag. 2012-02-17 12:56:46 -07:00
Albert Iordache
1d632c0666 Compiling fix 2012-02-16 19:06:04 +02:00
CaelAislinn
95b521dede Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-15 07:04:43 +10:00
CaelAislinn
9d798d3f95 updated some sprites, added new clothing 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-15 06:58:50 +10:00
CIB
9d12cf6c12 Merge pull request #422 from SkyMarshal/master 
More update_clothing() calls.
 2012-02-14 11:15:42 -08:00
SkyMarshal
7e140afe56 Added more update_clothing() calls 2012-02-14 12:12:42 -07:00
Albert Iordache
aa04eed7e8 Merge pull request #417 from SkyMarshal/master 
Should reduce lag, mobs no longer update icons ever tick.
 2012-02-14 04:20:00 -08:00
SkyMarshal
f59fb6af94 More updates, added comfy chairs. 2012-02-13 23:28:12 -07:00
SkyMarshal
0fe42327a5 This should hopefully reduce processing requirements, by not rebuilding icons every tick. 
(Ported oldcode, all props to Strumpetplaya)
 2012-02-13 21:54:22 -07:00
Albert Iordache
d848f7195a Small optimizations to metroid AIprocess() 2012-02-12 22:06:43 +02:00
SkyMarshal
90affc2bfc Merge pull request #392 from CIB/master 
Fixes to shock-crit and co
 2012-02-09 14:45:47 -08:00
nemo
f0e221a1ab Increased the speed at which you lose damage in shock-crit greatly, and the speed at which you heal in non-crit slightly. 2012-02-09 23:34:19 +01:00
SkyMarshal
e4d4173b97 Merge pull request #388 from Tastyfish/master 
job title choices! lizards speak normal, can pour things down sink
 2012-02-08 18:17:30 -08:00
Tastyfish
0ebbe456b3 job titles 2012-02-08 20:43:04 -05:00
Tastyfish
91635c4fbd Merge remote-tracking branch 'upstream/master' 2012-02-08 18:42:00 -05:00
SkyMarshal
1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
 2012-02-08 12:13:03 -07:00
SkyMarshal
ffb142abae Secure Airlock update! 
4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)
 2012-02-08 12:07:12 -07:00
Albert Iordache
1ae02519fc Merge pull request #380 from Abi79/master 
Small code cleanup
 2012-02-07 22:00:56 -08:00
Tastyfish
5e6e477e37 allowed lizards to talk normal 2012-02-07 19:54:09 -05:00
CaelAislinn
09490b8cb0 fixed derpy ai movement. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 06:16:12 +10:00
Albert Iordache
7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Miniature
6de4139066 Sky, that was there for a reason (fixing horrible runtimes everywhere) 2012-02-08 01:25:02 +10:30
SkyMarshal
664c6b7dec AI's can now understand pAI speech 
Tidied up some.
 2012-02-06 11:02:49 -07:00
CaelAislinn
87838c7cc5 Merge git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 03:28:09 +10:00
CaelAislinn
32a37c6001 fixed taj speak and taj whisper (not working over radio chat). use :j after the radio/headset commands to speak or whisper in tajaran (only taj mobs can speak / understand it) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 21:27:27 +10:00
SkyMarshal
1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00
CaelAislinn
1593a4923e new characters' jobs are now announced by the arrivals computer 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 05:26:41 +10:00
SkyMarshal
429d13e980 Herp, derp made blood work right. 2012-02-05 11:22:05 -07:00
CaelAislinn
14f0f8418c readded scary sound files. got somehow removed from the git tracker 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 03:41:11 +10:00
CaelAislinn
b1c66d2342 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/MultiZ.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 02:51:49 +10:00
CaelAislinn
9e4539fdce most cameras on the station are now split up into networks. the larger departments all have camera computers to monitor their departments (security and ai can see everywhere). ai can now see multiple networks at once, legacy proc ai_network_change() now acts as a shortcut to let the ai jump to a specific network (picks a random cam in that network). cleaned up / added / removed numerous cameras all over the station to be in line with this update. all camera monitor computers can be built with a single camera circuitboard, simply click the circuitboard when in hand and select a department (must be authorised by a department head). 
scattered minor updates, including removing unnecessary preceeding whitespace in the examine() verb.

added the tajaran as an adminspawnable race, see the forum topic for more information. features: new non-human (feline) playable mob, slightly more vulnerable to heat than humans, can speak in private language understood only by other tajarans (and possibly adept adminhackers), uses mob/living/carbon/human as a base template, so there will be unintended side effects (such as human hair overlays).
known bugs: ears/tail overlays, hud health (and temp?) display not updating, genetics will probably go haywire, speech bug means nothing can be said (high priority).

for the love of god, let this commit go through without trouble.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 02:46:00 +10:00
SkyMarshal
7a4b21382e Fixes for *custom v/h emotes 
Blood type is now a variable of the DNA datum
Fixed runtime from blood
Fixed the AI prompt being missed.
Added breath holding.
 2012-02-04 14:17:17 -07:00
CaelAislinn
b1f5183d61 fixed extra whitespace in the examine verb 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-05 01:49:34 +10:00
vageyenaman@gmail.com
d908f7f468 TG Updates: Bugfixes: Fix for Issue 161. Fix for Issue 239. Circuit imprinter runtime involving Atmosphereic Alert circuits. 
▫ Capitalized some letters in the security level messages. Because that really annoyed me!

▫ Merged Donkieyo's patches with the master branch. (Forum post: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=7051)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2706 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-03 08:09:32 +00:00
SkyMarshal
0e15736ba9 Fixes for gibber and detective computer. 
Fixed some hallucination and fingerprint stuff.
 2012-02-02 19:30:12 -07:00
SkyMarshal
20d5879c78 Derp. 2012-02-02 13:57:33 -07:00
SkyMarshal
30c338077f Fixes for the AI beginning of round prompt, autolathe is now public access. 2012-02-02 13:47:51 -07:00
SkyMarshal
16ac8ba8e0 Bugfixes. 2012-02-02 01:45:35 -07:00
SkyMarshal
e0c86aa6d3 Missed some sanity checks. 2012-02-02 00:36:50 -07:00
SkyMarshal
2ed57e0cc6 Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same. 
Added hallucinations properly.
Added LSD (with hallucinations.)
Remapped slightly.
 2012-02-02 00:35:48 -07:00
SkyMarshal
41749df402 Missed some stuff. 2012-01-31 21:36:22 -07:00
SkyMarshal
e7a7b8017d Fix for fingerprints. (They work right, now!) 
Fixed the runtime related to brainmobs (sanity check)
do_after now works right.
Added the Decapitate objective, that is admin only ATM, which requires you remove their head and take it on the escape shuttle.
Fixes for a lot of surgery related bugs
Added a prompt to AI players when they are greeted, warning them not to stalk the traitor and so on.  Cacophony and Spaceman approved of it.
Sanity check for limb removal and blood stuff.
Added in sprites for a Syndicate statis/sleeper for a secret thing I have planned!
 2012-01-31 21:23:37 -07:00
SkyMarshal
39f170b4b3 Final updates: 
Fingerprints done.
A mob's be_syndicate is a direct copy of their preferences.
 2012-01-31 02:30:54 -07:00
SkyMarshal
beffc2299a Final updates on Fingerprints 
fix for traitors getting assassinate and protect targets for the same person
Ported blood rejection
 2012-01-31 02:01:39 -07:00
SkyMarshal
6648061dcb MAJOR UPDATE: Detective/Fingerprints update 
bugfix for wardrobes
blood type is now handled by datum/dna, and blood_DNA for atoms is a list of list, each sub list containing DNA and blood-type. (This allows multiple blood splatters)
added BS12 give command and explosives
Map update to remove blob spawn.
 2012-01-31 02:01:38 -07:00
SkyMarshal
5dba3ccf88 WIP on detective work overhaul 
Give command ported, with more sanity checks (It works, now!)
Added BS12 c4 in addition to TG c4
Fixed server air alarm
Book length increased 3 fold.
Blood and gibs now maintains DNA
Fixed evidence bags
Ported the awesome BS12 handcuff stuff, with flavor text.
 2012-01-31 02:01:37 -07:00
SkyMarshal
d2eff85c17 Porting much of Aryn's stuff 
-Sounds
-Detective Work
-Hallucinations
Tweaked server air alarm
Tweaked gibs
Working on de-derping surgery
Ported some BS12 stuff (stunned radio and adminwho)
Player's mind datum now holds their antagonist preferences.
 2012-01-31 02:01:36 -07:00
Albert Iordache
76c695c88b Merge pull request #330 from CIB/master 
Autopsy fixes
 2012-01-29 09:33:42 -08:00
SkyMarshal
96588f1d88 Removed laser guns from Emaged sec borgs. Replaced with Toy Sword. 2012-01-29 03:24:52 -07:00
SkyMarshal
7472d4eb5d Fixes "chest is bleeding from a big gaping wound on her chest." 
(Someone was tired when they coded this)
 2012-01-29 02:28:04 -07:00