Commit Graph

311 Commits

Author SHA1 Message Date
Tigercat2000
cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
Fox-McCloud
c262be4d30 dun dun dun 2015-05-25 03:42:24 -04:00
Fox-McCloud
95a06fa165 updates and tweaks 2015-05-24 20:17:17 -04:00
Fox-McCloud
791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
ZomgPonies
95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
Fox-McCloud
78f7b8a8e8 Merge pull request #945 from Bram961/Ambience-runtime-fix
Runtime error fix
2015-05-05 00:12:08 -04:00
Bram961
58e90a8fa0 Runtime error fix
Hopefully this fixes the error:
runtime error: Cannot read null.ambience_playing
proc name: Entered (/area/Entered)
source file: areas.dm,388
2015-05-05 00:59:45 +02:00
DZD
dd27b54f15 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling 2015-04-22 11:51:18 -04:00
Fox-McCloud
099d638c15 Merge pull request #851 from ZomgPonies/shadow
Slime people fixes
2015-04-21 20:02:33 -04:00
ZomgPonies
1cc53ab186 Yeah and this too. 2015-04-21 20:00:19 -04:00
DZD
8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm
2015-04-21 18:56:34 -04:00
Fox-McCloud
e8038738f6 Merge pull request #800 from ZomgPonies/shadow
Mutantrace update
2015-04-21 18:36:24 -04:00
Bram961
4950e9c59a Splitting the Ambience and background noise
Splits off Ambience sounds and the background "shipambience.ogg" under
two difrent buttons.
2015-04-19 13:29:27 +02:00
ZomgPonies
dddecb9025 Change slime people to not need mutantrace anymore. 2015-04-13 07:59:25 -04:00
DZD
00035a51f0 It compiles!
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -04:00
DZD
0ab3a54fcb Copy-Paste Port of /tg/station's Shadowlings
Ports tgstation/-tg-station#8157

This won't compile, needs to be bugfixed and tested. The only reason I
am PRing  this right now is so that we don't have multiple people
working on the same thing.

@ZomgPonies This will require PROBABILITY SHADOWLING # to be added to
game_options.txt, and will likely require SQL database additions for the
BE_SHADOWLING antag preference.
2015-04-12 13:15:40 -04:00
ZomgPonies
cb987d3692 Alt Account checking 2015-04-06 23:12:15 -04:00
ZomgPonies
187e0d38f4 Fixing organ data stuff in DB 2015-04-06 17:15:08 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Tigercat2000
008cf4d365 Adds pref SOUND_HEARTBEAT 2015-03-17 17:30:28 +01:00
ZomgPonies
c693be1c57 Merge pull request #548 from tigercat2000/SlimeColorChanger
Allows slime people to change color in lobby.
2015-03-11 16:53:29 -04:00
ZomgPonies
d1587addaf No more crazy random colors 2015-03-09 22:32:14 -04:00
Tigercat2000
1c88cec5b1 Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger 2015-03-09 22:25:35 +01:00
ZomgPonies
c942b5e60c Adds Plasmaman to Karma Shop 2015-03-05 14:35:17 -05:00
Tigercat2000
ba6ec715c7 MySQL handling for slime color choice 2015-03-04 18:10:37 +01:00
Tigercat2000
64c0db3a80 Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger 2015-03-04 17:20:26 +01:00
Markolie
d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
Markolie
5e4539157c Add minimum age for drones/ERT 2015-02-28 19:40:56 +01:00
Markolie
20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
Markolie
3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie
c89e3ac1eb Revert "Revert "Emergency communications hotfix""
This reverts commit 3ea36839a8.
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
ZomgPonies
043a5e0e31 Merge pull request #331 from Markolie/master
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
Markolie
46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
ZomgPonies
8a0d5f05d8 Merge pull request #322 from Markolie/master
Refactor announcement system, crew monitor overhaul, z-level checks, add portable crew monitor, fixes
2015-02-17 14:05:49 -05:00
ZomgPonies
03a08e931a Fixes problem with sound toggles. 2015-02-17 04:55:18 -05:00
Markolie
f590c215b7 Comma fix 2015-02-17 01:04:38 +01:00
Markolie
d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
Markolie
4e2694cc03 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-12 19:11:35 +01:00
Markolie
3f80f66411 Simplify get_candidates, minor adjustment to antag ages 2015-02-12 19:09:05 +01:00
ZomgPonies
236552fb81 Fixes Alternate Job Titles 2015-02-10 05:18:59 -05:00
Tigercat2000
5c87c9f92c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-07 02:00:45 +01:00
Markolie
86dd7782d5 Add cyborg latejoining 2015-02-05 14:27:39 +01:00
Markolie
afac549c39 Revert economy changes, quarantine law fix 2015-02-02 20:02:29 +01:00
Markolie
8fb90212b8 Blob event fixes, toggle preferences age check, jobban check 2015-02-01 14:19:11 +01:00
Fox-McCloud
0d7c972084 Merge pull request #238 from Markolie/master
Mapfix, dbconfig update, sec camera template network fix, code cleanup, additional jobbans, antag minimum age
2015-01-31 19:54:51 -05:00
ZomgPonies
8049264b1c Default_slot fixes. 2015-01-31 19:07:20 -05:00