cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,150 Commits 14 Branches 2 Tags
d64e8284f6ca16cde3cc944a1a2c0fd77cfbfdd3
Commit Graph
3150 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SkyMarshal d64e8284f6 Fixed implanter problems, added some more silly emotes. 2012-01-01 19:57:57 -07:00
SkyMarshal d2bae46c39 Changed functionality of implanter. 2012-01-01 19:25:02 -07:00
SkyMarshal 755d2d711a Nuke revamp, some tweaking. 2012-01-01 18:58:28 -07:00
SkyMarshal 77637127ea Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-01 14:58:25 -07:00
Albert Iordache 6b16ac377b Merge pull request #189 from CIB/master 
Vira updates
 2012-01-01 13:05:21 -08:00
cib 40fb4bb628 Mucus and a few fixes to vira. 
Added mucus that is added to the map sometimes when sneezing or coughing. Blood now carries the spiller's virus2. Fixed a problem with virus spreading.
 2012-01-01 20:50:46 -08:00
Albert Iordache aa4f30bbef Minor deathgasp fix. 2012-01-01 22:48:53 +02:00
Albert Iordache 17449d0881 Re-enabled the deathgasp, because it activates traitor implants. 2012-01-01 22:46:37 +02:00
CIB bc18887dc7 Merge pull request #187 from Miniature/master 
Atmos control computer stuff (including adding to map)
 2012-01-01 08:52:09 -08:00
Miniature 205ad71ee6 Made atmos control show name of alarm, coloured active alarms in list, added to map 2012-01-02 03:18:06 +10:30
CIB c4d17ccb62 Merge pull request #186 from Miniature/master 
Atmos control computer
 2012-01-01 06:18:45 -08:00
Miniature 10401563e2 Atmos control computer 
Lets you use atmos alarms from atmospherics, if people press a button on the alarm
Not added to map
 2012-01-02 00:21:24 +10:30
Tastyfish 0ef43a9ae5 Merge pull request #185 from Tastyfish/master 
code was still referencing calling now-removed deathgasp emote
 2011-12-31 22:15:37 -08:00
Tastyfish c3f4808cd2 code was calling now-removed emote 2012-01-01 01:13:40 -05:00
Tastyfish 1f2f0a68dd Merge pull request #184 from Tastyfish/master 
fixed typo in piano
 2011-12-31 14:28:57 -08:00
Tastyfish 5628272bde fixed typo in piano 2011-12-31 17:28:19 -05:00
Tastyfish 5df72b9d70 Merge pull request #183 from Tastyfish/master 
somehow this bug was only an issue once in a real game, fixed
 2011-12-31 13:59:36 -08:00
Tastyfish 522f745e71 somehow this bug was only an issue once in a real game, fixed 2011-12-31 16:56:55 -05:00
Albert Iordache 47ada174be Merge pull request #182 from Tastyfish/master 
Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, status displays and light switches
 2011-12-31 11:38:31 -08:00
Tastyfish c02979c148 Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, intercoms, status displays, and light switches 2011-12-31 12:28:26 -05:00
Albert Iordache 977b37abde Fixed a runtime error. 2011-12-31 14:49:35 +02:00
Albert Iordache 18e6242dc8 Merge pull request #181 from Tastyfish/master 
fixed derp on vote announcement for custom vote
 2011-12-31 02:55:46 -08:00
Tastyfish a561862ef0 and there too 2011-12-31 01:51:06 -05:00
Tastyfish 2f6fc64353 admins cna see who set custom event now. 2011-12-31 00:35:44 -05:00
Tastyfish c654a3d8d8 fixed derp on vote announcement for custom vote 2011-12-30 23:41:06 -05:00
CIB a16c53ce7a Merge pull request #180 from SkyMarshal/master 
Bugfix for alien removal surgery
 2011-12-30 18:13:54 -08:00
cib 3a20da81aa Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-31 02:14:28 -08:00
cib efcd5c29a9 Fixed the hunger symptom which was still using BS12's system. 2011-12-31 02:13:02 -08:00
cib f7be1250a3 Many improvements to vira. 
Implemented an efficient system for infection. Made sneeze and cough increase infection chance. Increased the lifespan of spaceacillin in a host. Removed the drool symptom.
 2011-12-30 21:07:52 -08:00
cib df4419da1e Changed the genetics manual. 2011-12-30 19:43:01 -08:00
SkyMarshal 1a13cee7e6 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-30 19:04:00 -07:00
SkyMarshal 1c54c8b20f Bugfix for alien removal surgery 2011-12-30 19:03:29 -07:00
CIB 648476f8c0 Merge pull request #179 from Abi79/master 
Removed and commented out the last traces of goon auth. code
 2011-12-30 13:35:37 -08:00
Albert Iordache 39b6dd57e0 Removed and commented out the last traces of goon auth. code 2011-12-30 23:28:14 +02:00
Albert Iordache 7d6aead5a5 Merge pull request #178 from CIB/master 
Vira updates
 2011-12-30 12:12:59 -08:00
Albert Iordache 193fd76acf Merge pull request #177 from CIB/master 
Genetics manual
 2011-12-30 11:15:03 -08:00
SkyMarshal 4c95530d64 Merge pull request #176 from SkyMarshal/master 
Removed Clown/Mime crate.
 2011-12-30 10:02:15 -08:00
SkyMarshal 648199a82f Remove clown/mime costume crate, after a HoP went and started derping around with it. 2011-12-30 11:00:02 -07:00
Albert Iordache fe7ad1e122 Merge pull request #175 from SkyMarshal/master 
Added multiple string search to security records, fixed some evidence bag bugginess, fixed problem with the stamp remover.
 2011-12-30 09:58:39 -08:00
SkyMarshal 0fe2cdab96 Added multiple string search to security records, fixed some evidence bag bugginess, fixed problem with the stamp remover. 2011-12-30 09:15:04 -07:00
Albert Iordache ea92743b36 Merge pull request #173 from CIB/master 
Fix stupid bug with trauma/cryo
 2011-12-29 13:12:49 -08:00
cib d8ec1ae26b Fixed traumatic shock breaking cryo. 2011-12-29 22:09:36 -08:00
cib d4c3053372 Increased the chance of getting infected significantly, with the current system it's too low. 2011-12-29 16:50:20 -08:00
cib 80ecbbefb8 Added cryodoxane to genetics, removed med supplies across the station. 2011-12-29 15:34:39 -08:00
cib b5f8c930f1 Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested. 
Revert "Alien removal surgery, new traitor item, other stuff."

This reverts commit cc3bc60963.
 2011-12-29 15:15:51 -08:00
CIB 0d4dc1682c Merge pull request #172 from SkyMarshal/master 
I am a derp. (This fixes a stupid compile error.)
 2011-12-29 11:02:13 -08:00
SkyMarshal e12469aed9 Quick fix, and a fix for whispering. 
Signed-off-by: SkyMarshal
 2011-12-29 10:23:00 -07:00
CIB 67a76be16a Merge pull request #171 from SkyMarshal/master 
Fixed last pull request, my bad.
 2011-12-29 09:11:59 -08:00
SkyMarshal 5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm
 2011-12-29 10:08:58 -07:00
SkyMarshal 9ad0bc5c89 Can compile, now. 2011-12-29 10:01:19 -07:00