cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,525 Commits 14 Branches 2 Tags
dee83ef62e09670037b6bc050644dc226d9bccd2
Commit Graph
30525 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurorablade dee83ef62e ALL HAIL LEMONS 2016-09-22 02:00:04 -04:00
Aurorablade b00ce51135 THERE IS TOO A DOCKING PORT URGGHHH 2016-09-19 08:47:43 -04:00
Aurorablade 2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Aurorablade a703e62678 i hate map conflicts 2016-09-17 01:37:03 -04:00
Fox McCloudandGitHub bcb9cb676b Merge pull request #5687 from Aurorablade/Prffftt 
Bans All Russians
 2016-09-17 00:48:21 -04:00
Aurorablade a596c20ab9 freeze 2016-09-16 01:53:32 -04:00
Aurorablade fd9d6d8c71 ui stuff then map conflicts 2016-09-16 00:45:37 -04:00
Fox McCloudandGitHub 76c7546e6f Merge pull request #5681 from Crazylemon64/speedy_research 
Ports tg's associative-list research datums
 2016-09-14 23:43:35 -04:00
Crazylemon64 fb291bec3f Ports tg's associative-list research datums 2016-09-14 20:38:21 -07:00
ParadiseSS13-Bot bf07a52edb Automatic changelog generation for PR #5647 2016-09-14 20:44:48 -04:00
Fox McCloudandGitHub 86afa72148 Merge pull request #5647 from Krausus/mentorchat 
Changes Mod Say Into an Admin-to-Mentor Message Verb
 2016-09-14 20:44:46 -04:00
shazbot194andFox McCloud da6a80c2f4 Fixed the Riot foam icon (#5676) 
* Fixed the Riot foam icon

Adds the varable riot to both normal foam darts and adds some else if
statments to give both darts and modified darts the correct icon.

* Update ammo_casings.dm

* Update ammo_casings.dm

* Update ammo_casings.dm

* Fix for single shot stechkin

changes how the stechin updates it's magazine so the single shot
magazine doesn't go invisable.

* Revert "Fix for single shot stechkin"

This reverts commit 11974996c4.

* changed description

changes the discription and moves it one line down.
 2016-09-14 20:42:37 -04:00
Fox McCloudandGitHub 56d2ea2338 Merge pull request #5678 from LittleBigKid2000/shitmag-fix 
Fixes shitty stetchkin mags disappearing when you put a bullet in them
 2016-09-14 20:15:29 -04:00
ParadiseSS13-Bot 8004a1b423 Automatic changelog generation for PR #5629 2016-09-14 20:13:12 -04:00
Fox McCloudandGitHub 7155b74564 Merge pull request #5629 from Crazylemon64/data_disk_info 
Data disks now get a nice name and description when written to
 2016-09-14 20:13:11 -04:00
Crazylemon64 6bc84e0111 Data disks now get a nice name and description when written to 2016-09-14 16:29:27 -07:00
Isaac Erwin 8986dca9d8 Now the 45 mag can use all 9 sprites 2016-09-14 14:42:18 -04:00
Aurorablade b5f74be725 MORE ui stuff 2016-09-14 03:32:42 -04:00
Aurorablade 5b587ac01d more ui stuff 2016-09-13 22:29:05 -04:00
Isaac Erwin 3a1d07454f Okay, foxxy 2016-09-13 19:27:15 -04:00
ParadiseSS13-Bot 9828d3ee3f Automatic changelog generation for PR #5670 2016-09-13 02:55:12 -04:00
Fox McCloudandGitHub 50363212c5 Merge pull request #5670 from Krausus/StealthminPMFix 
Fixes PMing Stealthmins
 2016-09-13 02:55:10 -04:00
Aurorablade 2d8dbe9fcc nanoui shuttle shit 2016-09-13 02:27:18 -04:00
Krausus ce41e99f35 Fixes PMing stealthmins 2016-09-13 00:43:19 -04:00
Krausus 8625131204 Adds "Toggle Mentor Chat" verb 2016-09-12 23:27:07 -04:00
Krausus 5c5efe5087 Conflict resolution 2016-09-12 21:57:44 -04:00
ParadiseSS13-Bot 0a3333a7c9 Automatic changelog generation for PR #5642 2016-09-12 15:32:21 -04:00
Fox McCloudandGitHub c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00
ParadiseSS13-Bot 4aacbba162 Automatic changelog generation for PR #5602 2016-09-12 15:25:13 -04:00
Fox McCloudandGitHub f7289b6051 Merge pull request #5602 from FreeStylaLT/Propersatupdate 
Remaps Cyberiad's AI Satellite
 2016-09-12 15:25:12 -04:00
FreeStylaLT aa97fb840b Moves turrets up 2016-09-12 22:13:49 +03:00
Fox McCloudandGitHub f5e9b7aadf Merge pull request #5665 from LittleBigKid2000/dna-scrambler-fix 
Fixes DNA scrambler not having an icon
 2016-09-12 15:11:09 -04:00
Fox McCloudandGitHub 99c4e915d0 Merge pull request #5589 from uraniummeltdown/rndforthepeople 
Removes access restrictions from post-roundstart RnD Consoles (kind of)
 2016-09-12 14:39:56 -04:00
ParadiseSS13-Bot 02ab998f98 Automatic changelog generation for PR #5624 2016-09-12 14:36:34 -04:00
Fox McCloudandGitHub 336d37a36f Merge pull request #5624 from Kyep/syndie_radio 
Creates Syndicate Team Radio Frequency
 2016-09-12 14:36:31 -04:00
Fox McCloudandGitHub 962a655354 Merge pull request #5661 from GeneralChaos81/ClownMime 
Clown/mime door fix
 2016-09-12 14:21:50 -04:00
Krausus a9db8329d3 Revert "Adds cmd_mentor_say to mentor verbs" 
This reverts commit dda0a27bb0.
 2016-09-12 10:03:45 -04:00
GeneralChaos81 c5e9b0514f Redo of clown/mime door fix. 2016-09-12 20:11:54 +10:00
Isaac Erwin ea826aa949 Fixes DNA scrambler not having an icon 2016-09-11 23:44:27 -04:00
Fox McCloudandGitHub c589fbab34 Merge pull request #5659 from jughu/MISSION-B-S 
Fixes bs missing sprite #5655
 2016-09-11 22:42:39 -04:00
jughuandGitHub d9d5b41521 Yaya 2016-09-11 23:36:51 +02:00
Fox McCloudandGitHub a71507e587 Merge pull request #5654 from Krausus/BanAutoNoteFix 
Fixes Automated Ban Notes Having Incorrect Admin Ckeys
 2016-09-10 20:13:08 -04:00
Krausus 7ccedd41b4 Fixes automated ban notes having bad ckeys 2016-09-10 19:44:05 -04:00
Fox McCloudandGitHub 9c5bc2fc33 Merge pull request #5639 from LittleBigKid2000/spesshotel-runtime 
Fixes space hotel runtime/bad path thingy
 2016-09-09 23:12:35 -04:00
Krausus dda0a27bb0 Adds cmd_mentor_say to mentor verbs 2016-09-09 17:03:31 -04:00
Fox McCloudandGitHub 2f258f2747 Merge pull request #5640 from CyrusJazzberry/patch-9 
Fixes the beekeeper suit and hat descriptions
 2016-09-09 13:56:21 -04:00
JazzdoodleandGitHub a6a2aa2fda Update beekeeper_suit.dm 2016-09-09 07:24:26 -05:00
FreeStylaLT 4063350078 merge conflict fix 2016-09-09 12:27:16 +03:00
Krausus b0ac462166 Integrates UIDs into View Variables 2016-09-08 19:04:50 -04:00
Krausus d64bf46f12 Topic UID finishing touches 2016-09-08 13:07:14 -04:00