cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,221 Commits 6 Branches 0 Tags
3230ddcd257a57a72d67cb231d45c62a4d7aaca3
Commit Graph

3141 Commits

Author SHA1 Message Date
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
9d6e3378af Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-01 19:34:45 +00:00
heisen51@gmail.com
1d4f2f45af TG Updates: Projectile hit message changed. Now, instead of 
"<Victim> has been shot by the <projectile>", it's
"<Victim> is hit by the <projectile>".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2779 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 19:33:26 +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
Hawk-v3
7d9c17f5b5 More manual patchedits. 2012-03-01 19:09:36 +00:00
CIB
899331a58d Merge pull request #575 from Abi79/master 
News fixes
 2012-03-01 11:00:19 -08:00
quartz235@gmail.com
f85abe5414 TG Updates: Undoing my shitty moved_recently thing since petey sweetie actually made do_after not suck 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2771 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 18:51:52 +00:00
petethegoat@gmail.com
175875fc87 TG Update: do_after() now does its checks every tick, thus preventing people from fucking off for the duration, and coming back just before it finishes. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2770 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 18:46:41 +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
d9e615604e Subject: [PATCH 070/285] TG UPdates: Changelog code has been fixed, when editing it please use notepad or some other text editor that wont attempt to change everything. NOPE ~HAWK 
Bit of work on blob, mainly cleanup of the blob gamemode files.
 2012-03-01 18:18:32 +00:00
kortgstation@gmail.com
d5756b4612 TG Updates: Staff of Change victims now have Universal Speak (the metroids/xenos/monkeys can all speak english). 
Reverted it back to cultists getting one random word each because I broke something apparently.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2763 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 18:05:01 +00:00
Albert Iordache
cbb7ef99b7 Fixed bug about news editing and deleting. News can now be edited by any admin. 2012-03-01 13:04:54 +02:00
Miniature
03a40195b1 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-03-01 19:17:38 +10:30
Miniature
6e453e0aa1 Housekeeping with custom items 2012-03-01 19:10:52 +10:30
SkyMarshal
67502c5d2e Bugfixes for Hallucinations, borgs'n'doors, and airlocks autorefreshing. 2012-02-29 22:21:01 -07: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
kortgstation@gmail.com
b7f067fd4c Fix for borgs transformed by the Staff of Change dropping their cells and MMI on the ground. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2757 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 03:22:47 +00:00
kortgstation@gmail.com
db91705488 TG Updates: Fixed a bug I caused (where the Staff of Change was unable to fire). 
The Staff of Change no longer works on dead targets (to prevent resurrection when the new mob is created and the ckey transferred).

The Staff of Change can now cause a mob to change into a human (and a chance for said human to be a lizardman/metroidman/plantman/golem/normal human)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2756 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 03:22:14 +00:00
VivianFoxfoot@gmail.com
4bbea4187f TG UPDATES: Medium bullets (used by deathsquad pistols and nuke team SMGs) now knockdown their target like the 
detective's revolver.  They also do some eyeblur because of the hydrostatic shock.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2754 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 03:21:15 +00:00
trubblebass@gmail.com
540000b8c8 TG UPDATES: Only a small one this. 
- CMO's Hypospray now starts loaded with 25 units of Tricord.

have fun!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2753 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 03:20:29 +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
Hawk-v3
88390a0010 [PATCH 056/285] TG UPdates: fingerprints on cans now log on any attackby() that isn't a wrench/analyzer/pda/tank; added a 2 minute 
countdown var to humans/monkeys that resets when move() is called;(for an actual fix to the cuffbreak bug(NOPE, NOT ACTUALLY IN ~Hawk.)) changed a typo in security levels

committed a gib animation fix for Sieve (todo: make custom gib animations for simple_animals/metroids)
 2012-03-01 03:16:34 +00:00
kortgstation@gmail.com
748c1b8990 TG Updates: Sprited/added the blue magus and red magus robes 
The blue version functions as wizard robes and spawns on the wizard's shuttle, the red versions replace the old cultist robe sprites.

Cultists now each start with join/blood/self instead of one random word each.

Cultist supply talisman now has five uses and can spawn armor talismans.

Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2749 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-03-01 02:59:33 +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
SkyMarshal
e574bf251a More chemical updates. 2012-02-29 17:38:10 -07: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
Tastyfish
1724038ce9 Merge remote-tracking branch 'upstream/master' 2012-02-29 18:50:17 -05:00
Tastyfish
c8810833e9 make security huds work 2012-02-29 18:49:52 -05: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
Tastyfish
a107607092 custom jobs work in categories correctly now 2012-02-29 15:15:13 -05:00
Tastyfish
626bbaff4c fixed walllocker path 2012-02-29 15:07:51 -05:00
Chinski
a9e3e2d431 Made full-tile windows meld together like walls 2012-02-29 23:29:41 +04:00
Tastyfish
4dfa623b4a copy flavor text over for tajara transformation 2012-02-29 13:54:27 -05:00
Tastyfish
b5fd64e9c6 Merge remote-tracking branch 'upstream/master' 2012-02-28 22:04:47 -05:00
Tastyfish
4b99bc704f ntscript bugfix 2012-02-28 22:04:26 -05:00
Miniature
a93c13640a Merge pull request #553 from Miniature/master 
runtime fixes
 2012-02-28 19:02:37 -08:00
Miniature
86b3d3cde5 fix dna runtime 
seems like original cause was actually space ninjas not doing hair properly
 2012-02-29 13:28:54 +10:30
Miniature
47c7ae52b9 fix ai life runtime 2012-02-29 13:25:43 +10:30
Miniature
5783eb88dd disease splicer runtime fix 2012-02-29 13:23:26 +10:30
CIB
6cacfacf57 Merge pull request #549 from Hawk-v3/master 
TG UPDATES
 2012-02-28 18:26:18 -08:00
CIB
5515074571 Merge pull request #550 from Tastyfish/master 
removed some redundant code, disabled hair on tajarans
 2012-02-28 18:19:16 -08:00