cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,623 Commits 2 Branches 11 Tags
0d7ec7f71cb87bb178ff89497305812fd965f3e4
Commit Graph

10991 Commits

Author SHA1 Message Date
Alex
0d7ec7f71c Merge pull request #4831 from Ikarrus/cardcompfix 
Identification Console Update
 2014-09-16 12:12:45 +01:00
Alex
5187ad81c4 Merge pull request #4819 from Aranclanos/extinguishfix 
Fixes humans extinguishing themselves when they are in a turf with no oxygen.
 2014-09-16 12:12:17 +01:00
Alex
6a083ecda0 Merge pull request #4835 from Aranclanos/Entered 
Entered() cleanup
 2014-09-16 12:12:04 +01:00
Cheridan
d3e7e1b73d Merge pull request #4821 from phil235/FlashbangFix 
Fix for #3773
 2014-09-15 21:27:15 -05:00
Cheridan
ce2b8c4306 Merge pull request #4739 from Jordie0608/theiconstatenamesforturretsarelamewhocameupwiththem 
[MAP] Replaces area turrets with porta turrets
 2014-09-15 21:18:29 -05:00
Cheridan
6587b56a7c Merge pull request #4765 from JJRcop/magicarp-random 
Creates new "chaos magicarp" that fires a random projectile each time
 2014-09-15 10:22:50 -05:00
Cheridan
31b2043de6 Merge pull request #4743 from Iamgoofball/patch-4 
Department Revolt: More potential names
 2014-09-15 09:46:17 -05:00
Aranclanos
d15b9efe71 Removes some commented out code and some debug messages leftlovers from my previous commit. 2014-09-15 10:03:14 -03:00
Alex
57950abcf7 Merge pull request #4794 from Aranclanos/RnDfloral 
The RnD console won't break anymore when the floral gun is possible to build.
 2014-09-15 11:46:33 +01:00
Aranclanos
53f48fa599 Cleaned up the turf Entered() procs: 
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.

For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()

For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.

Mecha code got a small clean, removing the Entered() calls from there.
 2014-09-15 03:26:58 -03:00
Jordie0608
c2e664fa23 Merge branch 'master' of https://github.com/tgstation/-tg-station into theiconstatenamesforturretsarelamewhocameupwiththem 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-09-15 13:36:07 +10:00
Jordie0608
14cbabdb96 Merge fix (hopefully) 2014-09-15 12:56:56 +10:00
JJRcop
97a65cfb04 Changes Shoot() in magicarp to be forwards compatible 2014-09-14 16:07:54 -04:00
ikarrus
e8e1814a32 Identification Console Update 
- You can enter "Head of Security" as a custom title without it auto-correcting to "Head Of Security" and messing up job title identification
- Added an "Unassigned" option to the list of jobs. It strips all access from the card.
 2014-09-14 13:23:22 -06:00
Cheridan
2fad308f38 Merge pull request #4747 from Incoming5643/wandfireball 
Magic Mania√π: Adds the missing wand of fireball to summon magic
 2014-09-14 11:21:20 -05:00
phil235
e639737605 hearers() -> get_hear() Fixing the issue. 2014-09-14 15:35:23 +02:00
Alex
6697b18f7a Merge pull request #4770 from Donkie/glassfix 
Fixed welding a shard producing message spam
 2014-09-14 13:20:24 +01:00
phil235
4d427bf712 Partial fix for the immunity to flashbangs in the dark ( now only immune if in the dark AND inside a locker). Deaf people no longer see the "BANG" message of flashbangs. 2014-09-14 14:19:25 +02:00
Alex
3bf763f9a7 Merge pull request #4792 from Aranclanos/grabruntimes 
Fixes two runtimes related to the grab object.
 2014-09-14 13:19:04 +01:00
Alex
37b4c6bdfa Merge pull request #4793 from Aranclanos/falsewalldismantle 
Fixes the dismantling falsewalls with plasmacutters, diamond drills and energy blades.
 2014-09-14 13:16:16 +01:00
Alex
4c919969a8 Merge pull request #4773 from Donkie/jobnote 
Added note of what occupation the guy had at endround stats
 2014-09-14 13:16:06 +01:00
Alex
c504cdc46b Merge pull request #4766 from Cheridan/cult_spam 
Horrible Cult Spam Fix
 2014-09-14 13:15:14 +01:00
Alex
ad0d98a1c0 Merge pull request #4750 from Aranclanos/processloop 
Better loops for all the process tickers of the master controller.
 2014-09-14 13:14:53 +01:00
Alex
1431e64477 Merge pull request #4781 from Jordie0608/niknaksaystickymayhemisnotprofessionalyethetalksaboutpooping 
Removes log_adminwarn
 2014-09-14 13:14:22 +01:00
Alex
ba80b64191 Merge pull request #4798 from Lo6a4evskiy/AIfixer-fix 
AI restoration console shows ion laws
 2014-09-14 13:14:09 +01:00
Alex
01b9f2c851 Merge pull request #4800 from rbreslow/patch-1 
Fix span error
 2014-09-14 13:13:22 +01:00
Alex
43ff5a56fe Merge pull request #4814 from Ikarrus/handholdingspoonfeeding 
Shuttle Call/Recall Tracing in Announcements
 2014-09-14 13:13:11 +01:00
Alex
09dffeb90b Merge pull request #4807 from Miauw62/vOv 
Fixes ghosts not being able to hear binary.
 2014-09-14 13:09:35 +01:00
Alex
d8b87f029b Merge pull request #4808 from Miauw62/stuff 
Prevents an extreme edge case where fresh clones could talk.
 2014-09-14 13:09:22 +01:00
Alex
1523110bf5 Merge pull request #4784 from Aranclanos/Nukediskinfo 
Nuke disk deletion asay extra info
 2014-09-14 13:09:11 +01:00
Alex
22ea010752 Merge pull request #4787 from Aranclanos/sleeperschems 
Sleeper chems
 2014-09-14 13:08:58 +01:00
Alex
a3ba933515 Merge pull request #4799 from phil235/MachineryFix 
Multiple machinery fixes
 2014-09-14 13:08:30 +01:00
Alex
165df7e0ab Merge pull request #4806 from Miauw62/NEEIIGGGH 
Makes horse masks work again.
 2014-09-14 13:07:50 +01:00
Aranclanos
7a8c7dd801 Fixes humans extinguishing themselves when they are in a turf with no oxygen. 2014-09-14 04:33:10 -03:00
Alex
1b0e83e00a Merge pull request #4786 from Aranclanos/gamemodeunusedvars 
Removes two unused vars of the gamemode datums.
 2014-09-13 19:55:38 +01:00
Ikarrus
ce6b823f08 Update narsie.dm 2014-09-13 12:55:26 -06:00
ikarrus
9b8322c19d Shuttle Call/Recall Tracing in Announcements 
- Emergency  shuttle call/recall announcements will say when a tracing attempt has been successful, as well as explicitly telling players how to view them
- Clarified language further on how emergency shuttle tracing is done
- Increased tracing success rate from 60% to 70%
- Removed a lot of duplicated code by moving all the priority_announce() calls to incall()
 2014-09-13 12:50:38 -06:00
Cheridan
088fd2557f Merge pull request #4791 from hornygranny/alienfixes 
alien fixes
 2014-09-13 12:24:10 -05:00
Miauw
4abe60732c Prevents an edge case where fresh clones could talk. Fixed #2793 2014-09-13 13:59:27 +02:00
Miauw
6ff1e429fa Fixes ghosts not being able to hear binary. 2014-09-13 13:50:20 +02:00
Miauw
704ed6b352 HAAAWWWW!! Fixed #4753 2014-09-13 13:33:18 +02:00
Iamgoofball
af7be3cfdc Update departmentrevolt.dm 2014-09-12 16:41:37 -07:00
Iamgoofball
a15fc94460 Update departmentrevolt.dm 2014-09-12 15:56:45 -07:00
Aranclanos
86d197b7f3 removes a duplicate instance of 'imidazoline' in the reagents of the tier 3 of the sleepers, fixing my previous commit. 2014-09-12 19:54:05 -03:00
rbreslow
65f01cd1cd Fix span error 2014-09-12 15:34:13 -04:00
phil235
d056cf1b69 Multiple machinery fixes 2014-09-12 20:39:02 +02:00
Lo6a4evskiy
3bb4a871e6 AI restoration console shows ion laws 2014-09-12 19:35:46 +04:00
Aranclanos
5b436917db Removes a bunch of spawn() from one of the machines that generate shields - /obj/machinery/shieldwallgen (the one in xenobiology) 2014-09-12 07:55:17 -03:00
Aranclanos
53b938f1c3 The RnD console won't break anymore when the floral gun is possible to build. 2014-09-12 07:35:21 -03:00
Aranclanos
6b574ce07c Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades. 2014-09-12 06:44:25 -03:00