cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 16:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,498 Commits 29 Branches 2 Tags
09f0aed775d423b0fcdd0e51eaed23a0ce449e91
Commit Graph

23341 Commits

Author SHA1 Message Date
Krausus
09f0aed775 Fixes door/Move calling its parent twice 2016-09-28 13:01:48 -04:00
Fox McCloud
9829b05cb4 Merge pull request #5708 from Krausus/LingeringMachineFix 
Fixes Machines Staying Set After Logout
 2016-09-25 02:43:44 -04:00
FalseIncarnate
9a615154fe Refactors Drask defines into species/station.dm 
There was no reason for a single define and proc to have its own file.

I would have done the same with plasma-men, but they actually have a lot
of support procs because of their suits and such, so keeping that
self-contained makes much more sense.
 2016-09-24 21:54:46 -04:00
Krausus
1bad78e04d Fixes machines staying set after logout 2016-09-24 14:24:17 -04:00
Crazylemon64
deb5c01038 SMES and Borg coolers can now be made again, R&D maxing works again 2016-09-19 16:33:06 -07:00
KasparoVy
ffc0083098 bottlefix 2016-09-18 01:06:47 -04:00
Crazylemon64
fb291bec3f Ports tg's associative-list research datums 2016-09-14 20:38:21 -07:00
Fox McCloud
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
shazbot194
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 McCloud
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
Fox McCloud
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
Isaac Erwin
3a1d07454f Okay, foxxy 2016-09-13 19:27:15 -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
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00
Fox McCloud
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 McCloud
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
Fox McCloud
336d37a36f Merge pull request #5624 from Kyep/syndie_radio 
Creates Syndicate Team Radio Frequency
 2016-09-12 14:36:31 -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
jughu
d9d5b41521 Yaya 2016-09-11 23:36:51 +02:00
Krausus
7ccedd41b4 Fixes automated ban notes having bad ckeys 2016-09-10 19:44:05 -04:00
Krausus
dda0a27bb0 Adds cmd_mentor_say to mentor verbs 2016-09-09 17:03:31 -04:00
Jazzdoodle
a6a2aa2fda Update beekeeper_suit.dm 2016-09-09 07:24:26 -05: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
Jazzdoodle
c36b560776 Fixes the beekeeper suit and hat descriptions 
Just a minor text fix.
 2016-09-07 21:14:56 -05:00
Fox McCloud
20d0674ebf Merge pull request #5606 from FlattestGuitar/kits 
Adds Emergency Plasma/Nitrogen Tanks to Medical Storage
 2016-09-07 18:44:35 -04:00
Krausus
bf0dfef418 UID mass replace: text("src=\ref[]", src) 
Specifically gets rid of very simple text() calls that only included references to src
 2016-09-07 09:16:08 -04:00
Kyep
e4a9ced8f3 Changes syndi team radio display text 
From 'syndteam' to '#unid'. Close enough to '#unkn' used by normal
traitor, but distinct enough you can tell them apart.
 2016-09-06 21:50:36 -07:00
Fox McCloud
5e0e2f458e Merge pull request #5611 from DaveTheHeadcrab/fax_changes 
Changes Which Fax Machines Can Send To CC
 2016-09-06 15:37:15 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Krausus
aefb664a58 Implements UIDs and initial topic integration 2016-09-05 22:33:10 -04:00
Fox McCloud
6c4d87d691 Merge pull request #5621 from IcyV/Buckets-When 
Buckets can be worn as hats
 2016-09-05 17:42:14 -04:00
Kyep
02ffbd084e Creates Syndicate Team Radio Frequency 2016-09-05 03:35:29 -07:00
Fox McCloud
3b2cbcd57c Merge pull request #5619 from CyrusJazzberry/patch-8 
Fixes misc grammar and adds new attack messages
 2016-09-05 00:08:08 -04:00
Fox McCloud
34acbdda6e Merge pull request #5615 from CyrusJazzberry/patch-6 
Adds new violin attack messages
 2016-09-05 00:07:42 -04:00
Fox McCloud
93a449fa16 Merge pull request #5618 from Aurorablade/WhoNeedsJetpacks 
Slight Buff to Genetics
 2016-09-05 00:07:25 -04:00
Jazzdoodle
618df20380 Update misc.dm 2016-09-04 15:05:14 -05:00
IcyV
a015a11254 Buckets can be worn as hats 
Allows for buckets to be worn as a hat. Déjà vu.

![Bucket hats picture](http://puu.sh/qZvzt/6b80809f03.png)
Sprite by FullOfSkittles

🆑 IcyV
add: Buckets can be worn as hats.
/🆑
 2016-09-04 07:52:11 -07:00
theColdflame
4373165e21 Adds additional variants of 10mm ammunition. (#5596) 
* adds variants of 10mm ammunition

you can shoot people with it

* ones which work

* third time's the charm

* adds the letter 'u'

* makes armor pen values more reasonable

* rebalanced AP
 2016-09-04 09:38:39 -04:00
Fox McCloud
b72b2c8a5f Merge pull request #5613 from KasparoVy/sciberet 
Adds a Science beret, obtainable via the loadout system.
 2016-09-04 09:33:54 -04:00
jughu
9724419fe8 Adds 4 epin auto injectors to medbay vending machines (#5609) 
* Adds epin autoinjectors to medplus

* Changelog?

* INTO THE THRASHCAN IT GOES

* Brings back the bottles to 4
 2016-09-04 09:33:32 -04:00
Jazzdoodle
1c5953f01a Fixes misc grammar and adds new attack messages 
Cleans up the grammar of the Desk Fan and Ball Toy. Additionally, some new attack messages are added to the Red Phone and Cane.
 2016-09-03 21:00:46 -05:00
Aurorablade
cef17c6a73 prrffftttttttttt 2016-09-03 21:54:44 -04:00