cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,732 Commits 29 Branches 2 Tags
059178398eb226d369ebb486fb2ed7ed1ec41587
Commit Graph

9085 Commits

Author SHA1 Message Date
Tigercat2000
059178398e Force traitors into random role instead of returning to lobby. 2015-06-07 09:39:48 -07:00
Fox-McCloud
7ae9ec41a0 Merge remote-tracking branch 'upstream/master' into lootdrop 2015-06-05 18:10:30 -04:00
ZomgPonies
fd2dce684f Merge pull request #1159 from tigercat2000/MetaStationPort 
MetaStation V41A II port
 2015-06-05 17:49:13 -04:00
ZomgPonies
f65d374d1c Merge pull request #1249 from Fox-McCloud/AI-STATE-YOUR-LAWS 
TG Ion Storm Event and Toy AI
 2015-06-05 04:55:50 -04:00
Fox-McCloud
80ce8f2150 Merge pull request #1250 from ZomgPonies/meteor 
Adds waves to meteor gamemode
 2015-06-05 04:52:59 -04:00
ZomgPonies
ffdc3dbe3a Merge pull request #1248 from Krausus/EscapeObjectiveFix 
Fixes Escape Objective Issues
 2015-06-05 04:51:01 -04:00
Krausus
1cbacdb36d Fixes more monkey HUD issues 2015-06-05 03:16:52 -04:00
Krausus
a8d1313e7f Fixes clothing staying equipped when monkeyized 
Also fixes a minor typo in the monkey gene (de)activation message.
 2015-06-05 02:50:39 -04:00
Krausus
0638eb2a66 Fixes changeling monkey issues 
Fixes taking DNA from monkeys, not being able to leave lesser form, and
being able to use all stings in lesser form.
 2015-06-05 02:41:48 -04:00
Krausus
3880364321 Fixes monkey quick-equip 
Monkeys could use quick-equip to equip things they weren't supposed to.
 2015-06-05 00:57:19 -04:00
Tigercat2000
74f304e88c Metastation: Compatibility modifications 
This commit modifies metastation to actually be playable on our code
Squashed Commits:
 - [META] Fixes emergency shuttle being stuck
 - Toxins Mixing fix: chamber floor > engine
 - Adds research outpost + Chem lab to routpost
 - Add vox raider ship, fix pods and a few shuttle zones.
 - Remove step_x so TRAVIS likes it
 - Finish spawn points, add telepad.

 - Replace showroom with NT-rep/Blueshield Office
   Don't worry, the nuke keg is in the meeting room.
 - Convert art storage to barber shop, place artvend in tool storage
 - Buncha medbay tweaks, 2nd surgery table, body scanners, fixed sleepers,
   minor balance changes.
 - Add Mr. Changs to dorms
 - Update meta to latest paracode
 - Fix punpun
 - Atmos volume pumps, atmos control console
 - Add chicken statue to Mr. Chang's (*cry), Bar smartfridge
 - Fix mr. changs statue and chairs
 - Add togglable polarized windows to surgery, so surgeons can prevent seeing
   other surgery procedures if necessary
 - Actually add atmos control comp
 - Hydro trays are no longer dirt
 - Fix brig windoors
 - Fix escape shuttle sleepers
 2015-06-04 19:28:45 -07:00
ZomgPonies
42c4f3b053 Merge pull request #1255 from Fox-McCloud/closet-is-a-changeling 
Fixes Wardrobes Item Spawning
 2015-06-04 21:07:39 -04:00
Fox-McCloud
4eadd086d0 Fixes Wardrobes an Item Spawning 2015-06-04 20:13:18 -04:00
Fox-McCloud
7b455d8b89 Re-Works Maintenance Loot 2015-06-04 18:53:13 -04:00
ZomgPonies
6bf363b079 Merge pull request #1247 from Fox-McCloud/title-rockin' 
Adds in a New Title Theme
 2015-06-04 18:00:59 -04:00
Krausus
716d146ddd Makes escape objectives fail if restrained 
Also returns the "alive and free" wording to escape objectives.
 2015-06-04 13:14:44 -04:00
Tigercat2000
82f6855755 Initial Compiling port of MetaStation 2015-06-04 09:12:37 -07:00
ZomgPonies
c7c3efb5d0 Lets not spawn infinite meteors. 2015-06-04 05:43:57 -04:00
ZomgPonies
47de619fcc Merge pull request #1245 from Fox-McCloud/exam-room 
Exam Room Tweaks
 2015-06-04 05:37:14 -04:00
ZomgPonies
f37b35bc1f Adds meteor waves 2015-06-04 05:32:05 -04:00
Fox-McCloud
b6ee1342e9 Redoes the Ion Storm Event and Toy AI 2015-06-04 00:06:16 -04:00
Krausus
f72c21b606 Fixes Escape Objective Issues 
Escaping on pods will now work properly, and being handcuffed will cause
failure regardless of where you are.
 2015-06-03 20:46:23 -04:00
Fox-McCloud
055f57618c Adds in a New Title Theme 2015-06-03 18:36:57 -04:00
Fox-McCloud
296093951b defib failed 2015-06-03 02:24:02 -04:00
Fox-McCloud
c5f16b538a oops 2015-06-03 00:27:38 -04:00
Fox-McCloud
41512b0252 Exam Room Tweaks 2015-06-02 23:17:17 -04:00
Fox-McCloud
6f345ee1e3 Maintenance Rework Part Two 2015-06-02 21:44:43 -04:00
ZomgPonies
e83b65931e Merge pull request #1243 from Fox-McCloud/mai-valids 
Clarifies the Escape Objective
 2015-06-02 05:24:16 -04:00
Fox-McCloud
faa928c23c Clarifies the Escape Objective 2015-06-01 23:42:35 -04:00
ZomgPonies
97fadbede5 Merge pull request #1237 from Fox-McCloud/barsigns 
Refactors Barsigns
 2015-06-01 19:42:41 -04:00
ZomgPonies
12aad61ae4 Merge pull request #1240 from tigercat2000/dfc3c4e9aad5292ed3ff655785b59dfe 
Port -tg- shuffle helper proc
 2015-06-01 15:21:22 -04:00
ZomgPonies
e641c847d6 Merge pull request #1233 from Fox-McCloud/stun-balance 
Stun+Weaken Balancing
 2015-06-01 15:20:19 -04:00
ZomgPonies
16aff7c7ff Merge pull request #1236 from Fox-McCloud/grenade-hands 
Adds Grenade, Flash, and EMP in-hands
 2015-06-01 15:19:59 -04:00
Tigercat2000
b1dc47b4df Fix incorrect uses of the shuffle proc. 
Even before the -tg- proc port, it didn't do inline modification of the list.
 2015-06-01 08:23:31 -07:00
Fox-McCloud
866de52f0f SNIP 2015-05-31 22:32:20 -04:00
Fox-McCloud
bbed6a2a42 Refactors Barsigns 2015-05-31 20:04:12 -04:00
Fox-McCloud
e71bcdb9d0 Adds Grenade, Flash, and EMP in-hands 2015-05-31 16:39:41 -04:00
Aranclanos
58339aaee8 Malf factory-builder overlay. 
Added an overlay for the AI when she tries to spawn a robotic factory so
the user gets some feedback of where they are building.

Fixes numerous exploits to spawn several factories.
Fixes tgstation/-tg-station#1259
 2015-05-31 09:32:42 -07:00
Fox-McCloud
e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
ZomgPonies
e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS 
Port Atlas's implementation of -tg-'s canvas art.
 2015-05-30 20:17:41 -04:00
ZomgPonies
c0406687e0 Merge pull request #1215 from tigercat2000/Necastuff 
Disable enemy-intercept and automatic code blue, by request of Necaladun.
 2015-05-30 15:02:11 -04:00
Fox-McCloud
7a8a258a87 Merge pull request #1226 from Krausus/Fixes-201505300219 
Various Minor Fixes
 2015-05-30 07:00:48 -04:00
Krausus
f84e7e8e8d Fixes losing items when dismantling machine frames 2015-05-30 06:25:46 -04:00
Fox-McCloud
0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
ZomgPonies
01896f9209 Merge pull request #1208 from tigercat2000/coloredtilelight 
Colored Light Tiles
 2015-05-29 19:36:56 -04:00
Tigercat2000
cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
ZomgPonies
e7f38b2e5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into chingchong 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-05-29 17:53:07 -04:00
Tigercat2000
cb7a180b6e Disable intercept and auto-blue-alert. 
This PR Temporarily disables the intercept and automatic-blue-alert until
the system can properly be removed.
 2015-05-29 10:17:44 -07:00
ZomgPonies
ab3267f897 Merge pull request #1213 from Krausus/AirFixes-201505290432 
Minor Atmos Fixes
 2015-05-29 12:37:40 -04:00
Krausus
6273700c7a Fixes Job Randomization Exclusions 2015-05-29 08:44:27 -04:00