cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,959 Commits 26 Branches 2 Tags
ea79e4b272fbed8e75d93077df0076201d4cccea
Commit Graph

604 Commits

Author SHA1 Message Date
rockdtben
ea79e4b272 TG update: Removed some redundant checks 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2652 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:06:57 +02:00
ryantennessee@yahoo.com
7707864437 TG update: Jetpack changing to wrong sprite when turned on fixed. Syringes will autochange inject/draw when full/empty. Medborg syringes start full and set to inject even though the icon is still messed up. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:05:16 +02:00
Miniature
d74592c99e Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-24 03:34:53 +10:30
Miniature
803bed1c18 Custom items for special people 
They have to be manually coded in atm, but someone will no doubt eventually make it use a database when we get that going again (if we don't already)
 2011-12-24 03:34:25 +10:30
Tastyfish
8f53cb2d87 spaceman requested everyone having christmas hats admin verb for possible christmas event. it was possibly a joke I took seriosuly 2011-12-23 02:20:16 -05:00
Tastyfish
cee9634606 stick id's in computer by using id on it, better ear examine text 2011-12-22 01:47:40 -05:00
Tastyfish
db806b85d0 improved ear examine phrasing 2011-12-22 01:29:47 -05:00
Tastyfish
619ebeba66 updated NT law wording,NT law module in upload,lizards scratch instead of punch via space's rq,fixed downloading books 2011-12-21 03:55:16 -05:00
Mister Fox
9f52aef132 Added toggle-godmode, invisibility for Game Admins, BS12 versions of proccall for Game Masters 
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
 2011-12-20 08:01:54 -05:00
Mister Fox
2dffc6d00d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-20 06:43:08 -05:00
MlocMcMloc
9024737097 Merge pull request #126 from MlocMcMloc/master 
Removing EI NATH and gib-dropping.
 2011-12-20 02:57:06 -08:00
Mloc
d906d1358f Removed wizard gib spell, make gibbing and dust-ing drop everything on the person. 
Signed-off-by: Mloc <mloc@mloc.netii.net>
 2011-12-20 10:12:51 +00:00
MlocMcMloc
7f540f6811 Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738 
Yet again, check the description.
 2011-12-19 08:09:25 -08:00
MlocMcMloc
eebad1184b Merge pull request #119 from Tastyfish/master 
added 2 ears! (DNA scan this time!)
 2011-12-19 08:08:53 -08:00
Mister Fox
35b68d10e1 Automatic guest kicking 
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
 2011-12-19 08:30:15 -05:00
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
CompactNinja
f401c2e9ed Yes CN, ckey IS all in lower case. Lil' insignificant bugfix on my behalf. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-19 01:37:53 +10:30
Tastyfish
e3219fd09d 2 ears! 2011-12-18 06:02:15 -05:00
SkyMarshal
159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
Albert Iordache
45fa16929e Merge #93 cleanup. 2011-12-11 11:11:06 +02:00
cib
4d00ed6890 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/defines/mob/mob.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/humanoid/queen.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	maps/tgstation.2.0.8.dmm
 2011-12-10 01:11:00 -08:00
Albert Iordache
9d774ed3c9 Coffee and black tea now gets rid of the slurriness from alcohol. Also added Cib's slur proc. 2011-12-10 22:33:18 +02:00
Albert Iordache
e72ae5e8f6 Added a new slurring variable, and set it up in the right places 2011-12-10 14:25:49 +02:00
Albert Iordache
c68a22f497 Merge branch 'SkyMarshal-764432e' 2011-12-10 12:35:15 +02:00
cib
d970d2b4f9 Added a drunk variable and a text filter specifically for drunk talking, originally coded by Aryn. 2011-12-09 16:44:13 -08:00
SkyMarshal
764432e4e8 Fixed minor errors. 2011-12-08 22:13:51 -07:00
SkyMarshal
61d21b3cab Added the ability for borgs to ude departmental radios 2011-12-08 22:02:46 -07:00
Albert Iordache
ae34949324 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-09 18:58:32 +02:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
 2011-12-09 14:56:32 +02:00
Tastyfish
afd1aca53b let everyone do me emotes properly! (bots,monkeys,...) 2011-12-09 02:24:33 -05:00
unknown
8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00
Albert Iordache
dd6ddaa8c3 Revert "removed cloaker" 
This reverts commit 1fa97843f8.
 2011-12-08 15:28:35 +02:00
Albert Iordache
00e8e13d1e Merge pull request #76 from Tastyfish/master 
The closet tg merge broke charge crates
 2011-12-08 05:27:20 -08:00
Uristqwerty
74c2b7c55b Stealth PM fix: hide stealthmin names in the input box title. 2011-12-07 12:50:05 -05:00
Tastyfish
1fa97843f8 removed cloaker 2011-12-07 12:29:04 -05:00
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
 2011-12-07 07:53:20 +10:30
Miniature
5fec6c6319 DM why you so shit 2011-12-07 07:46:08 +10:30
Albert Iordache
9dc2644e51 Commented out more of the fat code, for issue #71. 2011-12-06 19:23:25 +02:00
Albert Iordache
6a62c3b8ff Merge pull request #71 from SkyMarshal/master 
Removed obesity upon overeating
 2011-12-06 08:48:06 -08:00
uporotiy
df04d75c48 Aaaaaaaaaand once again I forget to upload a new file. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2629 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 15:04:11 +00:00
SkyMarshal
68b1be773a Removed fatness from overeatting 2011-12-06 02:47:50 -07:00
uporotiy
4764cdc990 Aliens: 
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 08:30:03 +00:00
Tastyfish
139252dbda made me accept v/h in form of "me v waves."/"me h shouts!", fixed v/h types of robot emotes, added *help for robots 2011-12-06 00:30:07 -05:00
Tastyfish
571ee5f3de fixed Load Slot Close button 2011-12-05 14:33:18 -05:00
CompactNinja
dc3ada7c27 Merge pull request #66 from Miniature/master 
AI freelook stuff - should work perfectly now
 2011-12-04 21:45:13 -08:00
Miniature
a7b2110194 AI freelook stuff - should work perfectly now 
Urist said that /tg/ people got some runtime errors, I have no idea what they got and I haven't got any errors in testing so yeah.
 2011-12-05 15:08:52 +10:30
headswe
ec2456a1f0 Merge pull request #60 from Tastyfish/master 
borgs go beep and janitor borgs can OCD, charge ordering bug fix, flavor text
 2011-12-04 15:31:07 -08:00
Tastyfish
c208332942 added Anchorshag's examination flavor text thingy 2011-12-04 15:26:46 -05:00
Miniature
5b15848a07 Made pAIs tell candidates who is requesting. 2011-12-05 04:13:17 +10:30
Tastyfish
bba8104f38 Merge remote-tracking branch 'upstream/master' 2011-12-03 23:33:43 -05:00