cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,489 Commits 5 Branches 0 Tags
90f7029f4efdafedfe24e0c7ea741ed6677167c8
Commit Graph

836 Commits

Author SHA1 Message Date
Decius
021c48ea02 Added in damage towards people being converted by cult, and fixed a typo... 
People who are being converted by the cult now take 10 damage in the first
place. Additionally, those who resist take a little bit more damage and get
a fair number of messages showing their great painful resisting and whatnot.

Light and fun.

Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-07 22:23:20 -04:00
Zuhayr
b670cdcdf1 Fixes #5483 2014-07-04 17:48:12 +09:30
Hubblenaut
abef4bf943 Fixes teleporting while buckled 2014-07-02 22:35:11 +02:00
DJSnapshot
488c4f4b84 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop 
Conflicts:
	code/setup.dm
 2014-06-23 00:25:39 -07:00
DJSnapshot
7a5a3d47ae Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do. 2014-06-22 03:31:06 -07:00
DJSnapshot
9de9dab362 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 2014-06-22 02:08:42 -07:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
mwerezak
83abddd8a8 Fixes tails not rendering in record photos 2014-06-18 00:26:02 -04:00
Boop
d2e81da90c Fixes #4756 
removes the getrev stuff because it's svn and old and I couldn't get tg's stuff to work :c
 2014-06-17 17:25:57 +01:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
sick-trigger
ba83728e47 Scientist records photo fix 
Fixes #5156
 2014-06-09 17:45:16 +10:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Zuhayr
69c882bfec Fixes #4973 2014-06-01 20:46:58 +09:30
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Zuhayr
3b3bd5649d Merge pull request #5024 from Jarcolr/Cargo 
Adds 21 new crates and a tweak
 2014-05-28 01:21:24 +09:30
Jarcolr
049b9cc447 Fixes and a suggested change 
Fixed N2O typo, Super Pacman, anchor issues, inflatable barrier issues
that was already on master so this doesn't conflict, and added a new box
for shotgun shells and adjusted price of crates accordingly
 2014-05-27 17:15:17 +03:00
Ccomp5950
d411a6c48e Merge pull request #5060 from RavingManiac/master 
Fixed inflatable barrier crates
 2014-05-27 04:04:13 -05:00
RavingManiac
57a5bf45de Fixed inflatable barrier crates 2014-05-25 16:49:24 +08:00
mwerezak
d5b22e9125 Forgot to add VV menu entry for give_disease2 2014-05-24 12:14:16 -04:00
Jarcolr
dee051c336 Adds 21 new crates and a tweak 
http://baystation12.net/forums/viewtopic.php?f=5&t=10297
 2014-05-18 20:29:19 +03:00
Zuhayr
a8db1cd2a3 Hopefully fixes the double push bug. 2014-05-18 10:22:29 +09:30
jack-fractal
1c772ec1ff - fixing some compile errors and duplication 2014-05-13 20:48:33 -04:00
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
 2014-05-13 20:45:05 -04:00
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Mike
d684a77119 Fixes #4780 2014-05-01 23:58:47 -04:00
suethecake
2b2d64f05f Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 2014-04-27 01:00:16 -06:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Ccomp5950
f431f625a0 Merge pull request #4799 from Ravensdale/tratior 
Spelling correction: tratior and Tratior to traitor and Traitor
 2014-04-23 17:47:01 -05:00
Cael Aislinn
a847a817c3 tweaks/expands shield gen supply packs 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-04-23 08:48:13 +10:00
Ravensdale
a72f8d3ded Spelling correction: tratior and Tratior to traitor and Traitor 2014-04-22 01:12:17 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Jarcolr
6d36f8e3e0 Adds 2 new groups to cargo console; tweaks 
It may look like Supply, Operations, Hospitality and Miscellaneous might
not be filled enough with choices, but I'll see about making a huge
cargo update on dev.
 2014-04-11 19:49:48 +03:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2014-04-04 01:14:31 -05:00
DJSnapshot
8cb97330a7 Merge pull request #4657 from Baystation12/dev-freeze 
0.1.10 Staging [Standby]
 2014-03-30 16:57:01 -07:00
RavingManiac
7c75e591cd Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed. 2014-03-30 21:41:13 +08:00
Jarcolr
6568f4acfd Added more value to misc supply crates 
Your junk is even more junk-ish now!
 2014-03-30 00:13:56 +02:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-03-28 18:46:04 -05:00
Ccomp5950
936db263ef *NIX Log files part 2. 
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
 2014-03-26 18:51:37 -05:00
Ccomp5950
7000cce408 Admin Request: Logs now will end in CRLF on unix systems. 
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
 2014-03-23 02:26:06 -05:00
RKF45
8f9f0acec5 Give bees a chance. 2014-03-22 20:44:13 +01:00
RKF45
5d6f425dd4 Removal of bees 2014-03-22 18:45:28 +01:00
Ccomp5950
0e369578cc VV drop down menu to resend NanoUI resource files. 
Some players are having issues with NanoUI not opening up or acting funny
before the only fix was to have them log out, and log back in, check if that worked.
If not log out, delete cache log back in, if that don't work not much can be done.

Now we just skip the whole logout login thing and force the server to send the files
to their client once again skipping the need for their character to take a dirtnap for a moment.
 2014-03-21 23:03:06 -05:00