cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 22:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,598 Commits 8 Branches 26 Tags
92b47c94de21840b60d6b266c5d468fa911f3bd1
Commit Graph

4822 Commits

Author SHA1 Message Date
Albert Iordache
3fcf067310 Merge pull request #613 from SkyMarshal/master 
Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event, fixed Tajspeak, fixed the blob, fixed overdoses
 2012-03-03 23:55:37 -08:00
Albert Iordache
1575df93ce Merge pull request #614 from comma/master 
Some derpfixes
 2012-03-03 22:26:54 -08:00
comma
5ad05105f4 Small bugfix to ashtrays and cig butts 
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
 2012-03-04 06:45:14 +02:00
SkyMarshal
0a31e76f0f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-03 20:26:49 -07:00
SkyMarshal
3e3534f00b Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event. 
Map update has a redone CE's office and AI upload.
Explosions now let admins jump to them.
 2012-03-03 20:23:10 -07:00
joe.heinemeyer@gmail.com
5a3e58836d Added proper handling of fingerprints to fingerprint cards, added more info to a function on the detective's computer. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3248 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-04 03:19:25 +00:00
joe.heinemeyer@gmail.com
37d1db8ea7 Should fix the massive between round lag. Fucking gooncode. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3247 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-04 02:18:02 +00:00
kortgstation@gmail.com
38cf36bc36 You can no longer buckle people to roller beds from an infinite distance or as a ghost. 
You no longer see hand labels applied while unconscious.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3246 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-04 01:49:55 +00:00
Mloc
8ae3d23684 Merge pull request #611 from SkyMarshal/master 
Fixes for package wrap, added proper buttons and hotkeys to the gun system, fixed PDA manifest.
 2012-03-03 14:41:01 -08:00
SkyMarshal
1107f6e768 Fixes for package wrap, added proper buttons and hotkeys to the gun system, fixed PDA manifest. 2012-03-03 15:08:01 -07:00
Superxpdude@gmail.com
a7c1aef6be Fixes a bug regarding cloakers in syndicate bundles, they have now been replaced by thermals. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3243 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-03 20:53:11 +00:00
Ren Erthilo
d786d8642f Fixed roller bed. 2012-03-03 18:06:40 +00:00
comma
ef6473b964 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Now working
And without promoting myself as Game Master :P

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-03-03 03:16:30 +02:00
Hawk-v3
fe70dccc58 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-02 22:57:14 +00:00
Albert Iordache
0fe9ef55c2 Merge pull request #586 from CIB/master 
Some enhancements to the monkey AI
 2012-03-02 12:25:46 -08:00
comma
ee09389f5b Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-03-02 22:04:20 +02:00
comma
2edd73627d Added ashtrays 
Breakable. Spill contents on breaking or hitting the solid stuff after being thrown.
Have limited capacity. Can be emptied in disposal outlet.
Change sprite when are half-filled and filled.
Also fiddled a bit with the cigs code, so you can put them out without dropping.
 2012-03-02 21:56:08 +02:00
Hawk-v3
bc84c1efb0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-02 19:07:44 +00:00
Ren Erthilo
79501f3111 Changed AI laws to use crew instead of human. Left Asimov unchanged. Added more Ion Storms laws. 2012-03-02 18:25:28 +00:00
elly1989@rocketmail.com
9859a0b52f Committing fixes to code for examining mobs. Burn damage wasn't showing properly on some mobs. Fixed grammar, icons and stuff. 
Added some  stylesheet classes. Approved by Urist. If you're adding game text, please use the class that best describes the text. This way all the text formatting can be edited from the stylesheet rather than traipsing through the code like I am.
Cyborg names reflect their module choice.
Cyborgs can no longer drop their module-items on conveyor belts.
Please remember to add the line: gender = PLURAL to any new item defines if the item is plural, ie metal rods and such.
Much more to come. ;-; Just need to check them and merge... why did I start climbing this mountain?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3232 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-02 16:07:32 +00:00
joe.heinemeyer@gmail.com
96aa64be5d Added some hallucination/Detective work stuff I realized I missed AFTER I went to bed last night. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3231 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-02 16:03:46 +00:00
joe.heinemeyer@gmail.com
ba7ff62fb9 Buffed/bugfixed hallucinations. Uncommented the "Fake Attackers", for the lulz. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3230 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-02 06:37:50 +00:00
joe.heinemeyer@gmail.com
113beeb052 BS12 Detective Work port. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3229 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-02 05:23:08 +00:00
SkyMarshal
0d8c7d5e51 Reworked the gun system to handle hostage scenarios better. 
Ported and adjusted with permission from Lost Worlds.
 2012-03-01 19:20:39 -07:00
cib
e0a919be43 Monkeys now react to being attacked by doing emotes and trying to run away. 2012-03-01 16:03:55 -08:00
Hawk-v3
bfac567c87 Revert "Subject: [PATCH 093/285] TG Updates: Added a brown mining airlock." 
This reverts commit 243d1f2fab.
 2012-03-01 22:04:28 +00:00
Hawk-v3
243d1f2fab Subject: [PATCH 093/285] TG Updates: Added a brown mining airlock. 2012-03-01 21:36:30 +00:00
petethegoat@gmail.com
34f3012e98 TG Update: You can now fit basic pipes directly into wall girders. You probably won't notice this, but it makes things slightly easier for atmos techs. 
Several instances of ReplaceWithFloor changed to ReplaceWithPlating- the floor tiles under walls were annoying me. RCDs now create plating instead of floor also.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2786 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 21:29:32 +00:00
Hawk-v3
3079a89516 Commit for next update 2012-03-01 21:22:43 +00:00
musketstgstation@gmail.com
96fe016964 Fixed an accidental revert of an iconstate change from r2795 (erro, when you change the iconstate mention it in the commit log plzkthx) 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2797 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 19:53:29 +00:00
musketstgstation@gmail.com
88ac61af67 TG Updates: Separated empty soul belts and full soul belts for consistency with utility belts. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2796 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 19:52:23 +00:00
baloh.matevz
3230ddcd25 TG Updates: Soulstone belts and engineering belts are not the same things, KOR 
Fixed engineers starting with a belt full of soulstones caused by KOR in r2777.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2795 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 19:51:12 +00:00
Hawk-v3
bbc12c6713 Subject: [PATCH 084/285] TG Updates: Cyborgs now get a message that their parent AI has had their laws modified. (For Kor) 2012-03-01 19:31:58 +00:00
Hawk-v3
827552c499 Subject: [PATCH 083/285] Tg Updates: Added the Soul Stone Shard. tl;dr it functions like an intellicard for dead or dying humans. 
It will only work on a human if they are in crit/dead, if they actually have a player in them (so corpses where people
have ghosted are immune) and if the soul stone shard is empty.

Right now you can't do anything them other than capture people (and talk to them if you're near the stone)

Added a new belt variety that can only hold shards. Still needs its own sprites.

They currently do not spawn anywhere/are admin only.
 2012-03-01 19:19:31 +00:00
quartz235@gmail.com
754b4c6c7d TG Updates: Fixed psychic reinforced table deconstruction 
Fixed issue 270
- Changelings now have an "isabsorbing" var to prevent spamming absorb for free chems.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2766 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 18:21:19 +00:00
Hawk-v3
bff678772a [PATCH 064/285] TG UPDATES: Santa's toy bag! 
Fixed some miscellaneous stuff to prevent round-start crashing.
 2012-03-01 03:25:14 +00:00
heisen51@gmail.com
65afce8818 TG Updates: You now need to stand still for one whole second to place a grille. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2751 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 03:18:16 +00:00
SkyMarshal
122ed8581f Merge pull request #569 from comma/master 
Randomized cig butt sprites (5 variations)
 2012-02-29 18:55:48 -08:00
comma
e066006f51 Randomized cig butt sprites 2012-03-01 04:44:28 +02:00
Tastyfish
227a6d0541 Merge pull request #567 from SkyMarshal/master 
Some fixes for traitor uplinks, added overdoses for some chems by Laser50
 2012-02-29 17:00:12 -08:00
SkyMarshal
2b3fbc5047 Merge pull request #566 from Erthilo/master 
Added Notebook for the Detective
 2012-02-29 16:59:35 -08:00
Ren Erthilo
cf2b6ec28c Added Notebook for the Detective. 2012-03-01 00:23:29 +00:00
SkyMarshal
e8bd665e76 Added overdoses to some chemicals. Fixed some gamemode stuff, involving uplinks. 2012-02-29 17:17:41 -07:00
musketstgstation@gmail.com
ddc7f45a13 Integrated BS12's improved uplink code, courtesy of SkyMarshal. 
This means items now spawn in your hand if possible, items are sorted into categories, and only items you have enough telecrystals to purchase will be displayed.  Also, the same basic code is now used for PDA, headset and nuke-round uplinks, and it should be easier to add new items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3216 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-29 22:50:14 +00:00
SkyMarshal
665c2bf7fd Merge pull request #564 from SkyMarshal/master 
Tajarn bloody stuff and PDA bugfix
 2012-02-29 13:06:35 -08:00
SkyMarshal
3a14201f37 Bugfixes for PDA manifest and bloody Tarjans 2012-02-29 14:05:36 -07:00
Mloc
69399a8cac Merge pull request #560 from comma/master 
Melding windows
 2012-02-29 12:58:51 -08:00
Mloc
9cee329958 Merge pull request #563 from SkyMarshal/master 
Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.
 2012-02-29 12:51:48 -08:00
SkyMarshal
4524a2ff10 Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space. 2012-02-29 13:48:16 -07:00
Chinski
a9e3e2d431 Made full-tile windows meld together like walls 2012-02-29 23:29:41 +04:00