cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,912 Commits 9 Branches 26 Tags
1bdde438e5773afbc4356e67b859198287367710
Commit Graph
946 Commits
Author SHA1 Message Date
CIB 1bdde438e5 Merge pull request #435 from AppleMaster/master 
Random barsigns.
 2012-02-16 08:37:01 -08:00
Albert Iordache cc6c63edd7 Merge pull request #423 from caelaislinn/master 
added a couple of new clothing items, updated some sprites
 2012-02-16 08:29:15 -08:00
Jimapples ecc25f0580 Added randomised barsigns, again! 
Signed-off-by: Apples <chicken_face@ymail.com>
 2012-02-16 15:35:21 +00:00
SkyMarshal 8769fdd3fc Merge pull request #432 from Tastyfish/master 
ported in a bunch of the old food making stuff
 2012-02-15 19:11:30 -08:00
Tastyfish 4ce36641ea Merge remote-tracking branch 'upstream/master' 2012-02-15 20:06:49 -05:00
SkyMarshal 58d7da9008 Missing blood_DNA now goes into admin logs and stuff. 2012-02-15 10:26:22 -07:00
SkyMarshal 5e332d297d Added a sanity check, added some feedback stuff to help identify WTF is happening with blood. 2012-02-14 19:58:21 -07: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
SkyMarshal 7e140afe56 Added more update_clothing() calls 2012-02-14 12:12:42 -07:00
Tastyfish badb7bd93f Merge remote-tracking branch 'upstream/master' 2012-02-14 12:01:14 -05:00
Tastyfish 12d119c109 porting old food stuff 2012-02-14 11:59:16 -05: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
Mloc 1d4567bfc4 Merge pull request #404 from Uristqwerty/master 
Three fixes for the Runtime Errors topic.
 2012-02-12 12:01:06 -08:00
Uristqwerty 8e84ff57df Three fixes for the Runtime Errors topic. 
- null.check_tile_graphic() in FEA_system
- "Cancel".network in /proc/camera_network_sort
- "d699999427062f612349cb4948a6eb...".len (Might not be fixed entirely, but I fixed one place that it was being set incorrectly)
 2012-02-12 13:54:52 -05:00
Tastyfish aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05:00
Albert Iordache a6f89fefee Merge pull request #398 from caelaislinn/master 
new custom items
 2012-02-10 14:32:38 -08:00
CaelAislinn 0edd231592 added new custom items 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-11 07:24:50 +10:00
Tastyfish bd6fbb5fe8 fix to sky's reagent effects changes 2012-02-10 00:07:29 -05:00
SkyMarshal 1d29574bc3 Part 2 of the WIP chemistry stuff 
Map update with secure doors!
 2012-02-09 21:50:50 -07:00
CaelAislinn 4021891986 missing files 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-10 09:33:48 +10:00
CaelAislinn 03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-10 09:11:08 +10:00
SkyMarshal 8b62eff01a Cleaned up the fingerprint code 
Added sanity checks to the clean blood proc.
 2012-02-09 09:42:08 -07:00
SkyMarshal 710bcbb42b Final parts for the airlocks. 
Wrench -> Weld -> Wrench removes the cover
secure/centcom has all wires electrocute
Emag is now tweaked
Implanted uplink now works.
 2012-02-08 17:42:34 -07: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
Melvin Melonstorm f8f3f290c5 Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not. 2012-02-08 19:15:10 +01:00
CaelAislinn b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02:00
CaelAislinn 22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 11:47:07 +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
Albert Iordache a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
SkyMarshal e432958ab5 Bugfixes for airlocks 
Added detective work manual, that spawns on top of the detective's computer
Added RadioAlert proc
Added the capability to title the NanoTrasen updates
 2012-02-06 20:24:00 -07:00
SkyMarshal 1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00
SkyMarshal 85ee6ae562 Fixed a warning with meteors, HAWK: COMPILE DAMMIT 
Blood now works properly.
 2012-02-05 11:52:42 -07:00
Albert Iordache b2120f22e9 Merge pull request #368 from CIB/master 
Erthilo's sprites
 2012-02-05 06:23:39 -08:00
SkyMarshal 2074313f7f Updates to cigarettes and cigars 
Tables can now be thrown past
You can now put something in a disposal unit by throwing at it.
 2012-02-04 18:24:22 -07: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
cib d121b740d1 Added Erthilo's bone gel and bone setter sprites. 2012-02-04 11:59:46 -08:00
Hawk-v3 3f45c881e2 Removing something for sky. 2012-02-03 17:59:49 +00:00
Hawk-v3 e4905ae1af Patching for a item file. Please, check this. Deny if it isn't needed. I tried to make it work. 2012-02-03 10:54:25 +00:00
quartz235@gmail.comandHawk-v3 5f9fa90a90 TG Updates: Fixes: Issue 241 Issue 237 and Issue 240 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2708 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-03 08:55:24 +00:00
SkyMarshal 37ac7e31ee Hallucinations. 2012-02-02 21:53:08 -07:00
SkyMarshal 4290c35af8 Several detective fixes. 3 hour tape recorder. 2012-02-02 21:41:30 -07:00
SkyMarshal a2237a10dc Fixes for singularity beacon glitching 
further gibber fix.
Ghosts can no longer print autopsy reports
Shrunk evidence bags so they can be put in lockers.
 2012-02-02 19:59:15 -07:00
SkyMarshal 0e15736ba9 Fixes for gibber and detective computer. 
Fixed some hallucination and fingerprint stuff.
 2012-02-02 19:30:12 -07:00
SkyMarshal 3087c5d2e6 Hallucinations are 50x creepier now, thanks Mr. Fox. 2012-02-02 01:13:49 -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
Albert Iordache 43d1d5aaab Merge branch 'master' of https://github.com/Hawk-v3/Baystation12 into Hawk-v3-master 
Conflicts:
	code/modules/power/apc.dm
 2012-02-02 08:50:33 +02: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